Enable PNaCl by default (revert disabling CL)

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 56 matching lines @@
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
 
   // What variant are we running - newlib, glibc, pnacl, etc?
   // This is used to compute what directory we're pulling data from, but it can
   // also be used to affect the behavior of the test.
   virtual base::FilePath::StringType Variant() = 0;
 
   // 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.
   GURL TestURL(const base::FilePath::StringType& url_fragment);
 
   // Load a URL and listen to automation events with a given handler.
   // Returns true if the test glue function correctly.  (The handler should
   // seperately indicate if the test failed.)
   bool RunJavascriptTest(const GURL& url, TestMessageHandler* handler);
 
@@ skipping 21 matching lines @@
   virtual base::FilePath::StringType Variant() OVERRIDE;
 };
 
 class NaClBrowserTestGLibc : public NaClBrowserTestBase {
  public:
   virtual base::FilePath::StringType Variant() OVERRIDE;
 };
 
 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
 // pieces are stable and the old code is gone, this will go away.
 class NaClBrowserTestPnaclWithOldCache : public NaClBrowserTestPnacl {
  public:
   NaClBrowserTestPnaclWithOldCache();
 };
 
 // A NaCl browser test only using static files.
@@ skipping 14 matching lines @@
 
 #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
 
 #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 \
 IN_PROC_BROWSER_TEST_F(suite##GLibc, name) \
 body \
 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
 body
 
 #endif
 
 #endif  // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_