diff options
| -rw-r--r-- | chrome/browser/extensions/plugin_apitest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_browsertest.cc | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index eb94d77..39b1118 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -116,6 +116,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) // Timing out on ARM linux http://crbug.com/238467 #define MAYBE_PluginPrivate DISABLED_PluginPrivate +#elif defined(OS_WIN) && defined(ARCH_CPU_X86_64) +// TODO(jschuh): Failing plugin tests. crbug.com/244653 +#define MAYBE_PluginPrivate DISABLED_PluginPrivate #else #define MAYBE_PluginPrivate PluginPrivate #endif diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 72bb371..eaa89b7 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -1454,6 +1454,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { #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 #else #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin #endif @@ -1514,6 +1517,10 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { // http://crbug.com/100514 #define MAYBE_PrerenderIframeDelayLoadPlugin \ DISABLED_PrerenderIframeDelayLoadPlugin +#elif defined(OS_WIN) && defined(ARCH_CPU_X86_64) +// TODO(jschuh): Failing plugin tests. crbug.com/244653 +#define MAYBE_PrerenderIframeDelayLoadPlugin \ + DISABLED_PrerenderIframeDelayLoadPlugin #else #define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin #endif |