| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
|
| index 9891dc970b219d90534c3fc5a80d1f1afad44837..83043b58abe1a5a00a5843ccbbd080dadc7f8361 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -852,7 +852,10 @@ 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(OS_MACOSX)
|
| +#if defined(USE_AURA)
|
| +// http://crbug.com/103496
|
| +#define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin
|
| +#elif defined(OS_MACOSX)
|
| // http://crbug.com/100514
|
| #define MAYBE_PrerenderDelayLoadPlugin FAILS_PrerenderDelayLoadPlugin
|
| #else
|
| @@ -880,7 +883,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickToPlay) {
|
|
|
| // 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(OS_MACOSX)
|
| +#if defined(USE_AURA)
|
| +// http://crbug.com/103496
|
| +#define MAYBE_PrerenderIframeDelayLoadPlugin \
|
| + DISABLED_PrerenderIframeDelayLoadPlugin
|
| +#elif defined(OS_MACOSX)
|
| // http://crbug.com/100514
|
| #define MAYBE_PrerenderIframeDelayLoadPlugin \
|
| FAILS_PrerenderIframeDelayLoadPlugin
|
|
|