| Index: content/browser/plugin_browsertest.cc
|
| diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
|
| index 3c4d169a8dccafad9444533af1daf24d816debb7..df8fc58c2d60facda3e6dc6908ccac104e949702 100644
|
| --- a/content/browser/plugin_browsertest.cc
|
| +++ b/content/browser/plugin_browsertest.cc
|
| @@ -451,7 +451,14 @@ IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Real)) {
|
| TestPlugin("real.html");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(FlashOctetStream)) {
|
| +// http://crbug.com/320041
|
| +#if (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) || \
|
| + (defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN))
|
| +#define MAYBE_FlashOctetStream DISABLED_FlashOctetStream
|
| +#else
|
| +#define MAYBE_FlashOctetStream FlashOctetStream
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE_FlashOctetStream) {
|
| TestPlugin("flash-octet-stream.html");
|
| }
|
|
|
|
|