Re-enable PPAPI browser tests on mac.

chrome/test/ppapi/ppapi_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 211 matching lines @@
 TEST_PPAPI_NACL(Graphics2D_InitToZero)
 TEST_PPAPI_NACL(Graphics2D_Describe)
 TEST_PPAPI_NACL(Graphics2D_Paint)
 TEST_PPAPI_NACL(Graphics2D_Scroll)
 TEST_PPAPI_NACL(Graphics2D_Replace)
 TEST_PPAPI_NACL(Graphics2D_Flush)
 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
+#elif defined(OS_MACOSX)
+#define MAYBE_IN_Graphics3D 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_NACL_Graphics3D 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
 TEST_PPAPI_IN_PROCESS(MAYBE_IN_Graphics3D)
 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_OUT_Graphics3D)
 TEST_PPAPI_NACL(MAYBE_NACL_Graphics3D)
 
@@ skipping 1014 matching lines @@
           LIST_TEST(FlashDRM_GetHmonitor)
           LIST_TEST(FlashDRM_GetVoucherFile));
 }
 
 TEST_PPAPI_IN_PROCESS(TalkPrivate)
 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
 
 #if defined(OS_CHROMEOS)
 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
 #endif