| Index: content/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/content/test/ppapi/ppapi_browsertest.cc b/content/test/ppapi/ppapi_browsertest.cc
|
| index 75f93933df8144c723605d148ac7c1860a40efae..1a6a222fbd5159e3c443616a9184a24f78019199 100644
|
| --- a/content/test/ppapi/ppapi_browsertest.cc
|
| +++ b/content/test/ppapi/ppapi_browsertest.cc
|
| @@ -151,7 +151,13 @@ TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VarDeprecated)
|
| TEST_PPAPI_IN_PROCESS(VarResource)
|
| TEST_PPAPI_OUT_OF_PROCESS(VarResource)
|
|
|
| -TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)
|
| +// Flaky on Win, Linux and CrOS, http://crbug.com/602877
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_VideoDecoder DISABLED_VideoDecoder
|
| +#else
|
| +#define MAYBE_VideoDecoder VideoDecoder
|
| +#endif
|
| +TEST_PPAPI_OUT_OF_PROCESS(MAYBE_VideoDecoder)
|
|
|
| TEST_PPAPI_IN_PROCESS(VideoDecoderDev)
|
| TEST_PPAPI_OUT_OF_PROCESS(VideoDecoderDev)
|
|
|