Remove disable-pnacl flag.

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/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 206 matching lines @@
 }
 
 bool NaClBrowserTestBase::GetDocumentRoot(base::FilePath* document_root) {
   return GetNaClVariantRoot(Variant(), document_root);
 }
 
 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,
     content::TestMessageHandler* handler) {
   content::JavascriptTestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents(),
       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_pnacl = test_file;
   if (IsAPnaclTest()) {
     AddPnaclParm(test_file, &test_file_with_pnacl);
   }
   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, bool full_url) {
   NaClIntegrationMessageHandler handler;
   base::FilePath::StringType url_fragment_with_pnacl = url_fragment;
   if (IsAPnaclTest()) {
     AddPnaclParm(url_fragment, &url_fragment_with_pnacl);
   }
   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(full_url
                               ? GURL(url_fragment_with_both)
                               : 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.
@@ skipping 20 matching lines @@
 }
 
 bool NaClBrowserTestPnacl::IsAPnaclTest() {
   return true;
 }
 
 base::FilePath::StringType NaClBrowserTestPnaclDisabled::Variant() {
   return FILE_PATH_LITERAL("pnacl");
 }
 
-bool NaClBrowserTestPnaclDisabled::IsAPnaclTest() {
-  return true;
-}
-
-bool NaClBrowserTestPnaclDisabled::IsPnaclDisabled() {
-  return true;
-}
-void NaClBrowserTestPnaclDisabled::SetUpCommandLine(
-    base::CommandLine* command_line) {
-  NaClBrowserTestBase::SetUpCommandLine(command_line);
-  command_line->AppendSwitch(switches::kDisablePnacl);
-}
-
 base::FilePath::StringType NaClBrowserTestNonSfiMode::Variant() {
   return FILE_PATH_LITERAL("libc-free");
 }
 
 void NaClBrowserTestNonSfiMode::SetUpCommandLine(
     base::CommandLine* command_line) {
   NaClBrowserTestBase::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 }
 
@@ skipping 26 matching lines @@
   // to point at the isolated the test extension directory.
   // Otherwise, multiple NaCl extensions tests will end up sharing the
   // same directory when loading the extension files.
   base::FilePath document_root;
   ASSERT_TRUE(GetDocumentRoot(&document_root));
 
   // Document root is relative to source root, and source root may not be CWD.
   command_line->AppendSwitchPath(switches::kLoadExtension,
                                  src_root.Append(document_root));
 }