| 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;
|
|
|