Enable PNaCl by default (revert disabling CL)

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 42e27ce9bc7a502efe874eb2ee89c41eadf53b4c..27e638b02e47a23e85d475b01469f892ff2ca5c4 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.
@@ -116,11 +118,22 @@ class NaClBrowserTestGLibc : public NaClBrowserTestBase {
 
 class NaClBrowserTestPnacl : public NaClBrowserTestBase {
  public:
+  virtual base::FilePath::StringType Variant() OVERRIDE;
+
+  virtual bool IsAPnaclTest() OVERRIDE;
+};
+
+// Class used to test that when --disable-pnacl is specified the PNaCl mime
+// type is not available.
+class NaClBrowserTestPnaclDisabled : public NaClBrowserTestBase {
+ public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   virtual base::FilePath::StringType Variant() OVERRIDE;
 
-  virtual bool IsPnacl() OVERRIDE;
+  virtual bool IsAPnaclTest() OVERRIDE;
+
+  virtual bool IsPnaclDisabled() OVERRIDE;
 };
 
 // Temporary class for running tests with the old cache enabled. Once all the
@@ -155,7 +168,7 @@ body
 
 #else
 
-// Otherwise, we have Glibc, Newlib and PNaCl tests
+// 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 \