summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger/devtools_sanity_unittest.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 01:35:57 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 01:35:57 +0000
commit5c80747a160fe4b98315ad0ad84d3ac628131b8e (patch)
tree8932c13b5248afa80e5adda6fd872e15233d7f55 /chrome/browser/debugger/devtools_sanity_unittest.cc
parent6ab9365914c57aba28b40ba93e9f29d34c622436 (diff)
downloadchromium_src-5c80747a160fe4b98315ad0ad84d3ac628131b8e.zip
chromium_src-5c80747a160fe4b98315ad0ad84d3ac628131b8e.tar.gz
chromium_src-5c80747a160fe4b98315ad0ad84d3ac628131b8e.tar.bz2
Update WebKit to r93846.
BUG=none TEST=none TBR=podivilov Review URL: http://codereview.chromium.org/7741023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_sanity_unittest.cc')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 589478f..5e8ad78 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -356,7 +356,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
// hadn't been shown by the moment inspected paged refreshed.
// @see http://crbug.com/26312
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
- DISABLED_TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
+ TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
// Clear inspector settings to ensure that Elements will be
// current panel when DevTools window is open.
content::GetContentClient()->browser()->ClearInspectorSettings(
@@ -395,23 +395,22 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
}
// Tests network timing.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestNetworkTiming) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkTiming) {
RunTest("testNetworkTiming", kSlowTestPage);
}
// Tests network size.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestNetworkSize) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkSize) {
RunTest("testNetworkSize", kChunkedTestPage);
}
// Tests raw headers text.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestNetworkSyncSize) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkSyncSize) {
RunTest("testNetworkSyncSize", kChunkedTestPage);
}
// Tests raw headers text.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
- DISABLED_TestNetworkRawHeadersText) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkRawHeadersText) {
RunTest("testNetworkRawHeadersText", kChunkedTestPage);
}