Enable pnacl by default

chrome/test/nacl/nacl_browsertest_util.h

Index: chrome/test/nacl/nacl_browsertest_util.h
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
index 914f6ebc49956bf980feacd0a485ca7092dda702..e61ed661c68dc0568eef3497bf5c7b8d024a6de8 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -74,7 +74,9 @@ class NaClBrowserTestBase : public InProcessBrowserTest {
   // Where are the files for this class of test located on disk?
   virtual bool GetDocumentRoot(base::FilePath* document_root);
 
-  virtual bool IsPnacl();
+  virtual bool IsAPnaclTest();
+
+  virtual bool IsPnaclDisabled();
 
   // Map a file relative to the variant directory to a URL served by the test
   // web server.
@@ -120,7 +122,18 @@ class NaClBrowserTestPnacl : public NaClBrowserTestBase {
 
   virtual base::FilePath::StringType Variant() OVERRIDE;
 
-  virtual bool IsPnacl() OVERRIDE;
+  virtual bool IsAPnaclTest() OVERRIDE;
+};
+
+class NaClBrowserTestPnaclDisabled : public NaClBrowserTestBase {

[Mark Seaborn, 2013/07/18 01:25:52]

Can you add a comment about what this is for?  It looks like you're just using
it to run a single Javascript-only test.

[sehr, 2013/07/22 23:06:50]

Done.

+ public:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+
+  virtual base::FilePath::StringType Variant() OVERRIDE;
+
+  virtual bool IsAPnaclTest() OVERRIDE;
+
+  virtual bool IsPnaclDisabled() OVERRIDE;
 };
 
 // Temporary class for running tests with the new cache enabled. Once all the
@@ -157,14 +170,14 @@ body
 
 #else
 
-// Otherwise, we have Glibc, Newlib and PNaCl tests
+// Otherwise, we have Glibc, Newlib, Pnacl, and PnaclDisabled 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, MAYBE_PNACL(name)) \
-body
+body \

[Mark Seaborn, 2013/07/18 01:25:52]

Don't need to add a '\' here

[sehr, 2013/07/22 23:06:50]

Done.

 
 #endif