Fix disabling of failing test from r428558.

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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "base/win/windows_version.h"
@@ skipping 1281 matching lines @@
   void SetUpCommandLine(base::CommandLine* command_line) override {
     PackagedAppTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
   }
 };
 
 // Load a packaged app, and wait for it to successfully post a "hello" message
 // back.
 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
                        MAYBE_PPAPI_NACL(SuccessfulLoad)) {
+#if defined(OS_MACOSX)
+  if (base::mac::IsOS10_10() || base::mac::IsOS10_11())
+    return;  // Fails when swarmed. http://crbug.com/660582
+#endif
   RunTests("packaged_app");
 }
 
 #if defined(OS_LINUX)
 // http://crbug.com/579804
 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad
 #else
 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad)
 #endif
 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) {
-#if defined(OS_MACOSX)
-  if (base::mac::IsOS10_10() || base::mac::IsOS10_11())
-    return;  // Fails when swarmed. http://crbug.com/660582
-#endif
   RunTests("packaged_app");
 }
 
 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
                        MAYBE_PPAPI_NACL(MulticastPermissions)) {
   RunTests("multicast_permissions");
 }
 
 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
                        MAYBE_PPAPI_NACL(NoSocketPermissions)) {
   RunTests("no_socket_permissions");
 }
 
 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
                        MAYBE_PPAPI_NACL(SocketPermissions)) {
   RunTests("socket_permissions");
 }
 
 #endif