| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index f0e25cf3ae6eb37a1171afacaa8ee2f99cc437e0..dc061b6645582c6208ec328fab888bf442089ce5 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -241,24 +241,19 @@ TEST_PPAPI_NACL(Graphics2D_BindNull)
|
| // 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
|
| +// NaCl tests are having flaky failures on Win: crbug.com/242252
|
| #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
|
| #else
|
| -// The tests are failing in-process. crbug.com/280282
|
| -#define MAYBE_IN_Graphics3D DISABLED_Graphics3D
|
| #define MAYBE_OUT_Graphics3D Graphics3D
|
| #define MAYBE_NACL_Graphics3D Graphics3D
|
| #endif
|
|
|