Allow PNaCl NMF to set translator optimization options for experimentation.

chrome/test/nacl/nacl_browsertest_util.h

 // 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.
 
 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 112 matching lines @@
   virtual bool IsPnacl() OVERRIDE;
 };
 
 // A NaCl browser test only using static files.
 class NaClBrowserTestStatic : public NaClBrowserTestBase {
  public:
   virtual base::FilePath::StringType Variant() OVERRIDE;
   virtual bool GetDocumentRoot(base::FilePath* document_root) OVERRIDE;
 };
 
+// PNaCl's cache and PPB_FileIO currently trip up under ASAN:
+// https://code.google.com/p/chromium/issues/detail?id=171810
+// PNaCl tests take a long time on windows debug builds
+// and sometimes time out.  Disable until it is made faster:
+// https://code.google.com/p/chromium/issues/detail?id=177555
+#if defined(ADDRESS_SANITIZER) || (defined(OS_WIN) && !defined(NDEBUG))
+#define MAYBE_PNACL(test_name) DISABLED_##test_name
+#else
+#define MAYBE_PNACL(test_name) test_name
+#endif
+
 #if defined(ARCH_CPU_ARM_FAMILY)
 
 // There is no support for Glibc on ARM NaCl.
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body
 
-#elif defined(ADDRESS_SANITIZER) || (defined(OS_WIN) && !defined(NDEBUG))
-// PNaCl's cache and PPB_FileIO currently trip up under ASAN:
-// https://code.google.com/p/chromium/issues/detail?id=171810
-// PNaCl tests take a long time on windows debug builds
-// and sometimes time out.  Disable until it is made faster:
-// https://code.google.com/p/chromium/issues/detail?id=177555
-#define NACL_BROWSER_TEST_F(suite, name, body) \
-IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
-body \
-IN_PROC_BROWSER_TEST_F(suite##GLibc, name) \
-body
-
 #else
 
 // Otherwise, we have Glibc, Newlib and PNaCl tests
 #define NACL_BROWSER_TEST_F(suite, name, body) \
 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##GLibc, name) \
 body \
-IN_PROC_BROWSER_TEST_F(suite##Pnacl, name) \
+IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
 body
 
 #endif
 
 #endif  // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_