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..0a679c6efcf615893c63ccd73ea680694ee1f04c 100644 |
--- a/chrome/test/ppapi/ppapi_browsertest.cc |
+++ b/chrome/test/ppapi/ppapi_browsertest.cc |
@@ -1208,6 +1208,16 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
RUN_FLASH_MESSAGE_LOOP_SUBTESTS; |
} |
+#if defined(OS_WIN) && defined(USE_AURA) |
+// These tests fail with the test compositor which is what's used by default for |
+// browser tests on Windows Aura. Renable when the software compositor is |
+// available. |
+#define MAYBE_Compositor DISABLED_Compositor |
+#else // defined(OS_WIN) && defined(USE_AURA) |
+#define MAYBE_Compositor Compositor |
+#endif // defined(OS_WIN) && defined(USE_AURA) |
+TEST_PPAPI_NACL(MAYBE_Compositor) |
+ |
TEST_PPAPI_NACL(MediaStreamAudioTrack) |
TEST_PPAPI_NACL(MediaStreamVideoTrack) |