Index: chrome/test/ppapi/ppapi_browsertest.cc |
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc |
index 9642cc361dca7d5bd2ebaa8f2aeb918a059131b4..61f36365d4f717c1ac68d41b6294701b128da3a3 100644 |
--- a/chrome/test/ppapi/ppapi_browsertest.cc |
+++ b/chrome/test/ppapi/ppapi_browsertest.cc |
@@ -1208,6 +1208,19 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
RUN_FLASH_MESSAGE_LOOP_SUBTESTS; |
} |
+#if defined(OS_WIN) |
+// This test fails with the test compositor which is what's used by default for |
+// browser tests on Windows. Renable when the software compositor is available. |
+#define MAYBE_Compositor DISABLED_Compositor |
+#elif defined(OS_MACOSX) |
+// This test fails when using the legacy software mode. Reenable when the |
+// software compositor is enabled crbug.com/286038 |
+#define MAYBE_Compositor DISABLED_Compositor |
+#else |
+#define MAYBE_Compositor Compositor |
+#endif |
+TEST_PPAPI_NACL(MAYBE_Compositor) |
+ |
TEST_PPAPI_NACL(MediaStreamAudioTrack) |
TEST_PPAPI_NACL(MediaStreamVideoTrack) |