Remove GetSwitchValue() from chrome/* where easy.

chrome/test/test_launcher/out_of_proc_test_runner.cc

 // Copyright (c) 2010 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 <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 68 matching lines @@
     // Do not let the child ignore failures.  We need to propagate the
     // failure status back to the parent.
     new_cmd_line.AppendSwitch(kStrictFailureHandling);
 
     base::ProcessHandle process_handle;
     if (!base::LaunchApp(new_cmd_line, false, false, &process_handle))
       return false;
 
     int test_terminate_timeout_ms = kDefaultTestTimeoutMs;
     if (cmd_line->HasSwitch(kTestTerminateTimeoutFlag)) {
-      std::wstring timeout_str(
-          cmd_line->GetSwitchValue(kTestTerminateTimeoutFlag));
+      std::string timeout_str =
+          cmd_line->GetSwitchValueASCII(kTestTerminateTimeoutFlag);
       int timeout;
-      base::StringToInt(WideToUTF8(timeout_str), &timeout);
+      base::StringToInt(timeout_str, &timeout);
       test_terminate_timeout_ms = std::max(test_terminate_timeout_ms, timeout);
     }
 
     int exit_code = 0;
     if (!base::WaitForExitCodeWithTimeout(process_handle, &exit_code,
                                           test_terminate_timeout_ms)) {
       LOG(ERROR) << "Test timeout (" << test_terminate_timeout_ms
                  << " ms) exceeded for " << test_name;
 
       exit_code = -1;  // Set a non-zero exit code to signal a failure.
@@ skipping 100 matching lines @@
       "Starting tests...\n"
       "IMPORTANT DEBUGGING NOTE: each test is run inside its own process.\n"
       "For debugging a test inside a debugger, use the\n"
       "--gtest_filter=<your_test_name> flag along with either\n"
       "--single_process (to run all tests in one launcher/browser process) or\n"
       "--single-process (to do the above, and also run Chrome in single-\n"
       "process mode).\n");
   OutOfProcTestRunnerFactory test_runner_factory;
   return tests::RunTests(test_runner_factory) ? 0 : 1;
 }