Revert 57540

chrome/browser/extensions/permissions_apitest.cc

 // Copyright (c) 2010 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/browser/extensions/extension_apitest.h"
 #include "chrome/common/chrome_switches.h"
 
 class ExperimentalApiTest : public ExtensionApiTest {
 public:
   void SetUpCommandLine(CommandLine* command_line) {
@@ skipping 24 matching lines @@
   // tab id as an argument.  So, we need the tab permission to get
   // a tab id.
   ASSERT_TRUE(RunExtensionTest("permissions/experimental_disabled"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FavIconPermission) {
   ASSERT_TRUE(RunExtensionTest("permissions/favicon")) << message_;
 }
 
+// TODO(gregoryd): run the NaCl test on all systems once
+// http://code.google.com/p/chromium/issues/detail?id=51335 is fixed.
+// Meanwhile we run it on Mac OSX only, since we can be sure that an x86-32 NaCl
+// module will work there.
+// Mark as Flaky.  http://crbug.com/51861
 #if defined(OS_MACOSX)
-// Mark as Flaky.  http://crbug.com/51861
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_NaClPermissionEnabled) {
-#else
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NaClPermissionEnabled) {
-#endif
   ASSERT_TRUE(RunExtensionTest("permissions/nacl_enabled")) << message_;
 }
+#endif