diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 23:51:26 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 23:51:26 +0000 |
| commit | 3dfb43de4d51c47bdf448889efb64af3c437afb6 (patch) | |
| tree | f24d941f1f0600552b05f7be7691d85f664877be | |
| parent | b7b9227c5bf59dde49ca1f48ec66fa74b09d639e (diff) | |
| download | chromium_src-3dfb43de4d51c47bdf448889efb64af3c437afb6.zip chromium_src-3dfb43de4d51c47bdf448889efb64af3c437afb6.tar.gz chromium_src-3dfb43de4d51c47bdf448889efb64af3c437afb6.tar.bz2 | |
Revert 107810 (The NetInternalsDNSView tests are timeout out and causing bots to go red) - Roll webkit 98723:98752
TBR=caseq
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8343072
TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/8343076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107828 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/net_internals_ui_browsertest.cc | 9 |
2 files changed, 5 insertions, 6 deletions
@@ -5,7 +5,7 @@ vars = { "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "98752", + "webkit_revision": "98723", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", "nacl_revision": "6965", diff --git a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc index 7a91f0d..e4f575f 100644 --- a/chrome/browser/ui/webui/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals_ui_browsertest.cc @@ -274,24 +274,23 @@ IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsExportImportDump) { // dns_view.js //////////////////////////////////////////////////////////////////////////////// -// TODO: These tests started timing out somewhere around webkit 98733:98738. // Adds a successful lookup to the DNS cache, then clears the cache. -IN_PROC_BROWSER_TEST_F(NetInternalsTest, FAILS_NetInternalsDnsViewSuccess) { +IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewSuccess) { EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewSuccess")); } // Adds a failed lookup to the DNS cache, then clears the cache. -IN_PROC_BROWSER_TEST_F(NetInternalsTest, FAILS_NetInternalsDnsViewFail) { +IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewFail) { EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewFail")); } // Adds an expired successful lookup to the DNS cache, then clears the cache. -IN_PROC_BROWSER_TEST_F(NetInternalsTest, FAILS_NetInternalsDnsViewExpired) { +IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewExpired) { EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewExpired")); } // Adds two entries to the DNS cache, clears the cache, and then repeats. -IN_PROC_BROWSER_TEST_F(NetInternalsTest, FAILS_NetInternalsDnsViewAddTwoTwice) { +IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewAddTwoTwice) { EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewAddTwoTwice")); } |