Index: chrome/test/ppapi/ppapi_browsertest.cc |
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc |
index d23323bd6e6fd4e4117354ab3709d2032f80c517..d7809d9a4eda068b8c360b7e0fcf5d2ceed6a2f8 100644 |
--- a/chrome/test/ppapi/ppapi_browsertest.cc |
+++ b/chrome/test/ppapi/ppapi_browsertest.cc |
@@ -1196,6 +1196,16 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
RUN_FLASH_MESSAGE_LOOP_SUBTESTS; |
} |
+#if defined(OS_WIN) && defined(USE_AURA) |
raymes
2014/06/18 05:58:44
It seems quite important to have testing on Window
Peng
2014/06/18 11:14:36
I have no idea. On the windows trybot, Graphics3D
raymes
2014/06/19 00:39:13
Ah yes I see that the Graphics3D tests are disable
piman
2014/06/19 01:21:21
Not sure. If it's disabled on Windows but not Linu
Peng
2014/06/19 20:04:48
We can do it. But it need create a special test wh
|
+// 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) |