Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 406603002: Disable PrerenderOmniboxBrowserTest.PrerenderOmniboxCancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index e50f31e3e21b253036b75a7c60255152cc13faaa..b736df02654fbbdd94613f05aeba3346a82ba512 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -4360,8 +4360,15 @@ class PrerenderOmniboxBrowserTest : public PrerenderBrowserTest {
}
};
+// Times out on Mac at minimum. http://crbug.com/395152
+#if defined(OS_MACOSX)
+#define MAYBE_PrerenderOmniboxCancel DISABLED_PrerenderOmniboxCancel
+#else
+#define MAYBE_PrerenderOmniboxCancel PrerenderOmniboxCancel
+#endif
// Checks that closing the omnibox popup cancels an omnibox prerender.
-IN_PROC_BROWSER_TEST_F(PrerenderOmniboxBrowserTest, PrerenderOmniboxCancel) {
+IN_PROC_BROWSER_TEST_F(PrerenderOmniboxBrowserTest,
+ MAYBE_PrerenderOmniboxCancel) {
// Ensure the cookie store has been loaded.
if (!GetPrerenderManager()->cookie_store_loaded()) {
base::RunLoop loop;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698