Index: chrome/test/test_launcher/out_of_proc_test_runner.cc |
diff --git a/chrome/test/test_launcher/out_of_proc_test_runner.cc b/chrome/test/test_launcher/out_of_proc_test_runner.cc |
index 2401a36a02b275c259ddfa1a5c15d744eaf0a35f..eb4e172fc2dfd572ef465ee0f1e2dbec6a9cf328 100644 |
--- a/chrome/test/test_launcher/out_of_proc_test_runner.cc |
+++ b/chrome/test/test_launcher/out_of_proc_test_runner.cc |
@@ -86,10 +86,10 @@ class OutOfProcTestRunner : public tests::TestRunner { |
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); |
} |