diff options
| -rw-r--r-- | chrome/browser/prerender/prerender_browsertest.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 283dc1b..dd319f1 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -1594,11 +1594,21 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { // Checks that plugins are not loaded while a page is being preloaded, but // are loaded when the page is displayed. +#if defined(USE_AURA) && !defined(OS_WIN) // http://crbug.com/103496 +#define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin +#elif defined(OS_MACOSX) // http://crbug.com/100514 +#define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin +#elif defined(OS_WIN) && defined(ARCH_CPU_X86_64) // TODO(jschuh): Failing plugin tests. crbug.com/244653 +#define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin +#elif defined(OS_LINUX) +// http://crbug.com/306715 +#define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin +#endif // http://crbug.com/306715 -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderDelayLoadPlugin) { +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) { PrerenderTestURL("files/prerender/plugin_delay_load.html", FINAL_STATUS_USED, 1); @@ -1647,7 +1657,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { // Checks that plugins in an iframe are not loaded while a page is // being preloaded, but are loaded when the page is displayed. -#if defined(USE_AURA) +#if defined(USE_AURA) && !defined(OS_WIN) // http://crbug.com/103496 #define MAYBE_PrerenderIframeDelayLoadPlugin \ DISABLED_PrerenderIframeDelayLoadPlugin |