summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:31:25 +0000
committerdschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:31:25 +0000
commit837d51d107816ec5c91ea42980f07232cad67a4d (patch)
treed29eae07e107418e4eac0857f7b2a02780313b42
parent62808469557aef99d61d81d1adec695045513e60 (diff)
downloadchromium_src-837d51d107816ec5c91ea42980f07232cad67a4d.zip
chromium_src-837d51d107816ec5c91ea42980f07232cad67a4d.tar.gz
chromium_src-837d51d107816ec5c91ea42980f07232cad67a4d.tar.bz2
Re-enable PrerenderBrowserTest.PrerenderClearCache
The bug which caused the flakiness has hopefully been fixed. R=davidben@chromium.org BUG=270948 Review URL: https://codereview.chromium.org/47213008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231477 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/prerender/prerender_browsertest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 5e34e2c..363f2f5 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -2626,8 +2626,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearHistory) {
// Checks that when the cache is cleared, prerenders are cancelled but
// prerendering history is not cleared.
-// Flaky/times out on linux_aura, win, mac - http://crbug.com/270948
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderClearCache) {
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClearCache) {
PrerenderTestURL("files/prerender/prerender_page.html",
FINAL_STATUS_CACHE_OR_HISTORY_CLEARED,
1);