Commit 24493443 authored by johnnyg@chromium.org's avatar johnnyg@chromium.org

Roll webkit 98723:98752. Disable NetInternalsDnsView tests for real.

BUG=none
TEST=none
TBR=caseq
Review URL: http://codereview.chromium.org/8416059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107854 0039d316-1c4b-4281-b951-d872f2087c98
parent d96e7e94
...@@ -5,7 +5,7 @@ vars = { ...@@ -5,7 +5,7 @@ vars = {
"sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
"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": "98723", "webkit_revision": "98752",
"chromium_git": "http://git.chromium.org/git", "chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281", "swig_revision": "69281",
"nacl_revision": "6965", "nacl_revision": "6965",
......
...@@ -274,23 +274,25 @@ IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsExportImportDump) { ...@@ -274,23 +274,25 @@ IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsExportImportDump) {
// dns_view.js // dns_view.js
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// TODO http://crbug.com/102227. These tests timeout around webkit r98738.
// Adds a successful lookup to the DNS cache, then clears the cache. // Adds a successful lookup to the DNS cache, then clears the cache.
IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewSuccess) { IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewSuccess) {
EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewSuccess")); EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewSuccess"));
} }
// Adds a failed lookup to the DNS cache, then clears the cache. // Adds a failed lookup to the DNS cache, then clears the cache.
IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewFail) { IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewFail) {
EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewFail")); EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewFail"));
} }
// Adds an expired successful lookup to the DNS cache, then clears the cache. // Adds an expired successful lookup to the DNS cache, then clears the cache.
IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewExpired) { IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewExpired) {
EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewExpired")); EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewExpired"));
} }
// Adds two entries to the DNS cache, clears the cache, and then repeats. // Adds two entries to the DNS cache, clears the cache, and then repeats.
IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewAddTwoTwice) { IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewAddTwoTwice) {
EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewAddTwoTwice")); EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewAddTwoTwice"));
} }
......
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