| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index c83c83389bc823b14fedb6996de1b86853cd67a0..ac7fbd3c786dc9f75801b375337f361904761a66 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -725,12 +725,12 @@ TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev)
|
| #define MAYBE_FileIO DISABLED_FileIO
|
| #define MAYBE_FileIO_Private DISABLED_FileIO_Private
|
| #else
|
| -// Flaky on Mac. http://crbug.com/377599
|
| -# if defined(OS_MACOSX)
|
| +// Flaky on Mac and Win. http://crbug.com/377599
|
| +#if defined(OS_MACOSX) || defined(OS_WIN)
|
| #define MAYBE_FileIO DISABLED_FileIO
|
| -# else
|
| +#else
|
| #define MAYBE_FileIO FileIO
|
| -# endif // defined(OS_MACOSX)
|
| +#endif // OS_MACOSX || OS_WIN
|
| #define MAYBE_FileIO_Private FileIO_Private
|
| #endif
|
|
|
|
|