2 files changed, 25 insertions, 25 deletions

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index bef3801..a80718f 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -214,41 +214,41 @@ void UITestBase::TearDown() {
 void UITestBase::InitializeTimeouts() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(kUiTestTimeout)) {
-    std::wstring timeout_str = command_line.GetSwitchValue(kUiTestTimeout);
+    std::string timeout_str = command_line.GetSwitchValueASCII(kUiTestTimeout);
     int timeout;
-    base::StringToInt(WideToUTF8(timeout_str), &timeout);
+    base::StringToInt(timeout_str, &timeout);
     command_execution_timeout_ms_ = std::max(kCommandExecutionTimeout, timeout);
   }
 
   if (command_line.HasSwitch(kUiTestActionTimeout)) {
-    std::wstring act_str = command_line.GetSwitchValue(kUiTestActionTimeout);
+    std::string act_str =
+        command_line.GetSwitchValueASCII(kUiTestActionTimeout);
     int act_timeout;
-    base::StringToInt(WideToUTF8(act_str), &act_timeout);
+    base::StringToInt(act_str, &act_timeout);
     action_timeout_ms_ = std::max(kWaitForActionMsec, act_timeout);
   }
 
   if (command_line.HasSwitch(kUiTestActionMaxTimeout)) {
-    std::wstring action_max_str =
-        command_line.GetSwitchValue(kUiTestActionMaxTimeout);
+    std::string action_max_str =
+        command_line.GetSwitchValueASCII(kUiTestActionMaxTimeout);
     int max_timeout;
-    base::StringToInt(WideToUTF8(action_max_str), &max_timeout);
+    base::StringToInt(action_max_str, &max_timeout);
     action_max_timeout_ms_ = std::max(kWaitForActionMaxMsec, max_timeout);
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(kUiTestSleepTimeout)) {
-    std::wstring sleep_timeout_str =
-        CommandLine::ForCurrentProcess()->GetSwitchValue(kUiTestSleepTimeout);
+    std::string sleep_timeout_str =
+        command_line.GetSwitchValueASCII(kUiTestSleepTimeout);
     int sleep_timeout;
-    base::StringToInt(WideToUTF8(sleep_timeout_str), &sleep_timeout);
+    base::StringToInt(sleep_timeout_str, &sleep_timeout);
     sleep_timeout_ms_ = std::max(kWaitForActionMsec, sleep_timeout);
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(kUiTestTerminateTimeout)) {
-    std::wstring terminate_timeout_str =
-        CommandLine::ForCurrentProcess()->GetSwitchValue(
-            kUiTestTerminateTimeout);
+    std::string terminate_timeout_str =
+        command_line.GetSwitchValueASCII(kUiTestTerminateTimeout);
     int terminate_timeout;
-    base::StringToInt(WideToUTF8(terminate_timeout_str), &terminate_timeout);
+    base::StringToInt(terminate_timeout_str, &terminate_timeout);
     terminate_timeout_ms_ = std::max(kWaitForActionMsec, terminate_timeout);
   }
 }
diff --git a/chrome/test/ui/ui_test_suite.cc b/chrome/test/ui/ui_test_suite.cc
index 934a8e9..fd83857 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());
   }