Enable PNaCl by default (revert disabling CL)

chrome/test/nacl/nacl_browsertest_util.cc

 // 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.
 
 #include "chrome/test/nacl/nacl_browsertest_util.h"
 
 #include <stdlib.h>
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/json/json_reader.h"
@@ skipping 169 matching lines @@
 
 static void AddPnaclParm(const base::FilePath::StringType& url,
                          base::FilePath::StringType* url_with_parm) {
   if (url.find(FILE_PATH_LITERAL("?")) == base::FilePath::StringType::npos) {
     *url_with_parm = url + FILE_PATH_LITERAL("?pnacl=1");
   } else {
     *url_with_parm = url + FILE_PATH_LITERAL("&pnacl=1");
   }
 }
 
+static void AddPnaclDisabledParm(const base::FilePath::StringType& url,
+                                 base::FilePath::StringType* url_with_parm) {
+  if (url.find(FILE_PATH_LITERAL("?")) == base::FilePath::StringType::npos) {
+    *url_with_parm = url + FILE_PATH_LITERAL("?pnacl_disabled=1");
+  } else {
+    *url_with_parm = url + FILE_PATH_LITERAL("&pnacl_disabled=1");
+  }
+}
+
 NaClBrowserTestBase::NaClBrowserTestBase() {
 }
 
 NaClBrowserTestBase::~NaClBrowserTestBase() {
 }
 
 void NaClBrowserTestBase::SetUpCommandLine(CommandLine* command_line) {
   command_line->AppendSwitch(switches::kEnableNaCl);
 }
 
 void NaClBrowserTestBase::SetUpInProcessBrowserTestFixture() {
   // Sanity check.
   base::FilePath plugin_lib;
   ASSERT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
   ASSERT_TRUE(base::PathExists(plugin_lib)) << plugin_lib.value();
 
   ASSERT_TRUE(StartTestServer()) << "Cannot start test server.";
 }
 
 bool NaClBrowserTestBase::GetDocumentRoot(base::FilePath* document_root) {
   return GetNaClVariantRoot(Variant(), document_root);
 }
 
-bool NaClBrowserTestBase::IsPnacl() {
+bool NaClBrowserTestBase::IsAPnaclTest() {
   return false;
 }
 
+bool NaClBrowserTestBase::IsPnaclDisabled() {
+  return false;
+}
+
 GURL NaClBrowserTestBase::TestURL(
     const base::FilePath::StringType& url_fragment) {
   base::FilePath expanded_url = base::FilePath(FILE_PATH_LITERAL("files"));
   expanded_url = expanded_url.Append(url_fragment);
   return test_server_->GetURL(expanded_url.MaybeAsASCII());
 }
 
 bool NaClBrowserTestBase::RunJavascriptTest(const GURL& url,
                                             TestMessageHandler* handler) {
   JavascriptTestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
       handler);
   ui_test_utils::NavigateToURL(browser(), url);
   return observer.Run();
 }
 
 void NaClBrowserTestBase::RunLoadTest(
     const base::FilePath::StringType& test_file) {
   LoadTestMessageHandler handler;
-  base::FilePath::StringType test_file_with_parm = test_file;
-  if (IsPnacl()) {
-    AddPnaclParm(test_file, &test_file_with_parm);
+  base::FilePath::StringType test_file_with_pnacl = test_file;
+  if (IsAPnaclTest()) {
+    AddPnaclParm(test_file, &test_file_with_pnacl);
   }
-  bool ok = RunJavascriptTest(TestURL(test_file_with_parm), &handler);
+  base::FilePath::StringType test_file_with_both = test_file_with_pnacl;
+  if (IsPnaclDisabled()) {
+    AddPnaclDisabledParm(test_file_with_pnacl, &test_file_with_both);
+  }
+  bool ok = RunJavascriptTest(TestURL(test_file_with_both), &handler);
   ASSERT_TRUE(ok) << handler.error_message();
   ASSERT_TRUE(handler.test_passed()) << "Test failed.";
 }
 
 void NaClBrowserTestBase::RunNaClIntegrationTest(
     const base::FilePath::StringType& url_fragment) {
   NaClIntegrationMessageHandler handler;
-  base::FilePath::StringType url_fragment_with_parm = url_fragment;
-  if (IsPnacl()) {
-    AddPnaclParm(url_fragment, &url_fragment_with_parm);
+  base::FilePath::StringType url_fragment_with_pnacl = url_fragment;
+  if (IsAPnaclTest()) {
+    AddPnaclParm(url_fragment, &url_fragment_with_pnacl);
   }
-  bool ok = RunJavascriptTest(TestURL(url_fragment_with_parm), &handler);
+  base::FilePath::StringType url_fragment_with_both = url_fragment_with_pnacl;
+  if (IsPnaclDisabled()) {
+    AddPnaclDisabledParm(url_fragment_with_pnacl, &url_fragment_with_both);
+  }
+  bool ok = RunJavascriptTest(TestURL(url_fragment_with_both), &handler);
   ASSERT_TRUE(ok) << handler.error_message();
   ASSERT_TRUE(handler.test_passed()) << "Test failed.";
 }
 
 bool NaClBrowserTestBase::StartTestServer() {
   // Launch the web server.
   base::FilePath document_root;
   if (!GetDocumentRoot(&document_root))
     return false;
   test_server_.reset(new net::SpawnedTestServer(
                          net::SpawnedTestServer::TYPE_HTTP,
                          net::SpawnedTestServer::kLocalhost,
                          document_root));
   return test_server_->Start();
 }
 
 base::FilePath::StringType NaClBrowserTestNewlib::Variant() {
   return FILE_PATH_LITERAL("newlib");
 }
 
 base::FilePath::StringType NaClBrowserTestGLibc::Variant() {
   return FILE_PATH_LITERAL("glibc");
 }
 
 base::FilePath::StringType NaClBrowserTestPnacl::Variant() {
   return FILE_PATH_LITERAL("pnacl");
 }
 
-bool NaClBrowserTestPnacl::IsPnacl() {
+bool NaClBrowserTestPnacl::IsAPnaclTest() {
   return true;
 }
 
-void NaClBrowserTestPnacl::SetUpCommandLine(CommandLine* command_line) {
+base::FilePath::StringType NaClBrowserTestPnaclDisabled::Variant() {
+  return FILE_PATH_LITERAL("pnacl");
+}
+
+bool NaClBrowserTestPnaclDisabled::IsAPnaclTest() {
+  return true;
+}
+
+bool NaClBrowserTestPnaclDisabled::IsPnaclDisabled() {
+  return true;
+}
+void NaClBrowserTestPnaclDisabled::SetUpCommandLine(CommandLine* command_line) {
   NaClBrowserTestBase::SetUpCommandLine(command_line);
-  command_line->AppendSwitch(switches::kEnablePnacl);
+  command_line->AppendSwitch(switches::kDisablePnacl);
 }
 
 NaClBrowserTestPnaclWithOldCache::NaClBrowserTestPnaclWithOldCache() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   env->SetVar("PNACL_USE_OLD_CACHE", "true");
 }
 
 base::FilePath::StringType NaClBrowserTestStatic::Variant() {
   return FILE_PATH_LITERAL("static");
 }
 
 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) {
   *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl"));
   return true;
 }