Remove GetSwitchValue() from chrome/* where easy.

chrome/test/ui/ui_test_suite.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 "chrome/test/ui/ui_test_suite.h"
 
 #include <string>
 
 #include "base/environment.h"
 #include "base/path_service.h"
@@ skipping 31 matching lines @@
   UITest::set_safe_plugins(
       parsed_command_line.HasSwitch(switches::kSafePlugins));
   UITest::set_dump_histograms_on_exit(
       parsed_command_line.HasSwitch(switches::kDumpHistogramsOnExit));
   UITest::set_enable_dcheck(
       parsed_command_line.HasSwitch(switches::kEnableDCHECK));
   UITest::set_silent_dump_on_dcheck(
       parsed_command_line.HasSwitch(switches::kSilentDumpOnDCHECK));
   UITest::set_disable_breakpad(
       parsed_command_line.HasSwitch(switches::kDisableBreakpad));
-  std::wstring test_timeout =
-      parsed_command_line.GetSwitchValue(UITestSuite::kTestTimeout);
+  std::string test_timeout =
+      parsed_command_line.GetSwitchValueASCII(UITestSuite::kTestTimeout);
   if (!test_timeout.empty()) {
     int timeout;
-    base::StringToInt(WideToUTF8(test_timeout), &timeout);
+    base::StringToInt(test_timeout, &timeout);
     UITest::set_test_timeout_ms(timeout);
   }
 
 #if defined(OS_WIN)
   int batch_count = 0;
   int batch_index = 0;
-  std::wstring batch_count_str =
-      parsed_command_line.GetSwitchValue(UITestSuite::kBatchCount);
+  std::string batch_count_str =
+      parsed_command_line.GetSwitchValueASCII(UITestSuite::kBatchCount);
   if (!batch_count_str.empty()) {
-    base::StringToInt(WideToUTF16Hack(batch_count_str), &batch_count);
+    base::StringToInt(batch_count_str, &batch_count);
   }
-  std::wstring batch_index_str =
-      parsed_command_line.GetSwitchValue(UITestSuite::kBatchIndex);
+  std::string batch_index_str =
+      parsed_command_line.GetSwitchValueASCII(UITestSuite::kBatchIndex);
   if (!batch_index_str.empty()) {
-    base::StringToInt(WideToUTF16Hack(batch_index_str), &batch_index);
+    base::StringToInt(batch_index_str, &batch_index);
   }
   if (batch_count > 0 && batch_index >= 0 && batch_index < batch_count) {
     // Running UI test in parallel. Gtest supports running tests in shards,
     // and every UI test instance is running with different user data dir.
     // Thus all we need to do is to set up environment variables for gtest.
     // See http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide.
     std::string batch_count_env(UITestSuite::kGTestTotalShards);
-    batch_count_env.append(WideToASCII(batch_count_str));
+    batch_count_env.append(batch_count_str);
     std::string batch_index_env(UITestSuite::kGTestShardIndex);
-    batch_index_env.append(WideToASCII(batch_index_str));
+    batch_index_env.append(batch_index_str);
     _putenv(batch_count_env.c_str());
     _putenv(batch_index_env.c_str());
   }
 #endif
 
   std::string js_flags =
     parsed_command_line.GetSwitchValueASCII(switches::kJavaScriptFlags);
   if (!js_flags.empty())
     UITest::set_js_flags(js_flags);
   std::string log_level =
@@ skipping 39 matching lines @@
   if (!base::LaunchApp(crash_service.ToWStringHack(), false, false,
                        &crash_service_)) {
     printf("Couldn't start crash_service.exe, so this ui_test run won't tell " \
            "you if any test crashes!\n");
     return;
   }
 
   printf("Started crash_service.exe so you know if a test crashes!\n");
 }
 #endif