Remove GetSwitchValue() from chrome/* where easy.

chrome/test/ui/ui_test_suite.cc

Index: chrome/test/ui/ui_test_suite.cc
diff --git a/chrome/test/ui/ui_test_suite.cc b/chrome/test/ui/ui_test_suite.cc
index 934a8e9d36e945a05ff914e35d9b5165271955d8..fd83857d3ba0a73fc59360660cdda07dc2dbf024 100644
--- a/chrome/test/ui/ui_test_suite.cc
+++ b/chrome/test/ui/ui_test_suite.cc
@@ -49,26 +49,26 @@ void UITestSuite::Initialize() {
       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,
@@ -76,9 +76,9 @@ void UITestSuite::Initialize() {
     // 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());
   }