diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-09 23:03:04 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-09 23:03:04 +0000 |
| commit | f33ca361b0b6e699b91f89ea8d55bac82d622fb0 (patch) | |
| tree | 30147e3a178456e81ed38725afaefc827535b41e /chrome/browser/prerender/prerender_browsertest.cc | |
| parent | 4a21022ecd41318e0c9828bd21c601250ce141e4 (diff) | |
| download | chromium_src-f33ca361b0b6e699b91f89ea8d55bac82d622fb0.zip chromium_src-f33ca361b0b6e699b91f89ea8d55bac82d622fb0.tar.gz chromium_src-f33ca361b0b6e699b91f89ea8d55bac82d622fb0.tar.bz2 | |
Renable PrerenderBrowserTest.PrerenderDelayLoadPlugin on Windows and other platforms that it was enabled on. r228305 disabled it on all platforms even though it was flaking just on Linux.
Also enable PrerenderIframeDelayLoadPlugin on Win Aura since plugins work there now.
BUG=306715,103496
R=abodenha@chromium.org
Review URL: https://codereview.chromium.org/101633004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_browsertest.cc')
| -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 |