Commit 5c80747a authored by pkasting@chromium.org's avatar pkasting@chromium.org

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
parent 6ab93659
...@@ -4,7 +4,7 @@ vars = { ...@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn", "googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "93781", "webkit_revision": "93846",
"chromium_git": "http://git.chromium.org/git", "chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281", "swig_revision": "69281",
"nacl_revision": "6539", "nacl_revision": "6539",
......
...@@ -356,7 +356,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { ...@@ -356,7 +356,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
// hadn't been shown by the moment inspected paged refreshed. // hadn't been shown by the moment inspected paged refreshed.
// @see http://crbug.com/26312 // @see http://crbug.com/26312
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
DISABLED_TestScriptsTabIsPopulatedOnInspectedPageRefresh) { TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
// Clear inspector settings to ensure that Elements will be // Clear inspector settings to ensure that Elements will be
// current panel when DevTools window is open. // current panel when DevTools window is open.
content::GetContentClient()->browser()->ClearInspectorSettings( content::GetContentClient()->browser()->ClearInspectorSettings(
...@@ -395,23 +395,22 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, ...@@ -395,23 +395,22 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
} }
// Tests network timing. // Tests network timing.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestNetworkTiming) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkTiming) {
RunTest("testNetworkTiming", kSlowTestPage); RunTest("testNetworkTiming", kSlowTestPage);
} }
// Tests network size. // Tests network size.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestNetworkSize) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkSize) {
RunTest("testNetworkSize", kChunkedTestPage); RunTest("testNetworkSize", kChunkedTestPage);
} }
// Tests raw headers text. // Tests raw headers text.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestNetworkSyncSize) { IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkSyncSize) {
RunTest("testNetworkSyncSize", kChunkedTestPage); RunTest("testNetworkSyncSize", kChunkedTestPage);
} }
// Tests raw headers text. // Tests raw headers text.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestNetworkRawHeadersText) {
DISABLED_TestNetworkRawHeadersText) {
RunTest("testNetworkRawHeadersText", kChunkedTestPage); RunTest("testNetworkRawHeadersText", kChunkedTestPage);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment