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..0def64eeafb1aebbba864bc8852e0586164fc2ae 100644 |
--- a/chrome/test/ppapi/ppapi_browsertest.cc |
+++ b/chrome/test/ppapi/ppapi_browsertest.cc |
@@ -229,25 +229,13 @@ TEST_PPAPI_NACL(Graphics2D_FlushOffscreenUpdate) |
TEST_PPAPI_NACL(Graphics2D_BindNull) |
#if defined(OS_WIN) |
-#if 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_IN_Graphics3D DISABLED_Graphics3D |
#define MAYBE_OUT_Graphics3D DISABLED_Graphics3D |
#define MAYBE_NACL_Graphics3D DISABLED_Graphics3D |
-#else // defined(USE_AURA) |
-// In-process and NaCl tests are having flaky failures on Win: crbug.com/242252 |
-#define MAYBE_IN_Graphics3D DISABLED_Graphics3D |
-#define MAYBE_OUT_Graphics3D Graphics3D |
-#define MAYBE_NACL_Graphics3D DISABLED_Graphics3D |
-#endif // defined(USE_AURA) |
#elif defined(OS_MACOSX) |
-// These tests fail when using the legacy software mode. Reenable when the |
-// software compositor is enabled crbug.com/286038 |
-#define MAYBE_IN_Graphics3D DISABLED_Graphics3D |
-#define MAYBE_OUT_Graphics3D DISABLED_Graphics3D |
-#define MAYBE_NACL_Graphics3D DISABLED_Graphics3D |
+#define MAYBE_IN_Graphics3D Graphics3D |
+#define MAYBE_OUT_Graphics3D Graphics3D |
+#define MAYBE_NACL_Graphics3D Graphics3D |
#else |
// The tests are failing in-process. crbug.com/280282 |
#define MAYBE_IN_Graphics3D DISABLED_Graphics3D |