Revert 205329 "Split pnacl and nacl mime types"

trunk/src/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 "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/values.h"
@@ skipping 159 matching lines @@
 //                            glibc/
 static bool GetNaClVariantRoot(const base::FilePath::StringType& variant,
                                base::FilePath* document_root) {
   if (!ui_test_utils::GetRelativeBuildDirectory(document_root))
     return false;
   *document_root = document_root->Append(FILE_PATH_LITERAL("nacl_test_data"));
   *document_root = document_root->Append(variant);
   return true;
 }
 
-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");
-  }
-}
-
 NaClBrowserTestBase::NaClBrowserTestBase() {
 }
 
 NaClBrowserTestBase::~NaClBrowserTestBase() {
 }
 
 void NaClBrowserTestBase::SetUpCommandLine(CommandLine* command_line) {
   command_line->AppendSwitch(switches::kNoFirstRun);
   command_line->AppendSwitch(switches::kEnableNaCl);
 }
@@ skipping 27 matching lines @@
   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);
-  }
-  bool ok = RunJavascriptTest(TestURL(test_file_with_parm), &handler);
+  bool ok = RunJavascriptTest(TestURL(test_file), &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);
-  }
-  bool ok = RunJavascriptTest(TestURL(url_fragment_with_parm), &handler);
+  bool ok = RunJavascriptTest(TestURL(url_fragment), &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(
@@ skipping 25 matching lines @@
 }
 
 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;
 }