1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index f71dc00..e5bdb85 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -206,8 +206,8 @@ int main(int argc, char* argv[]) {
   if (parsed_command_line.HasSwitch(test_shell::kTestShellTimeOut)) {
     const std::wstring timeout_str = parsed_command_line.GetSwitchValue(
         test_shell::kTestShellTimeOut);
-    int timeout_ms =
-        static_cast<int>(StringToInt64(WideToUTF16Hack(timeout_str.c_str())));
+    int timeout_ms;
+    base::StringToInt(WideToUTF8(timeout_str), &timeout_ms);
     if (timeout_ms > 0)
       TestShell::SetFileTestTimeout(timeout_ms);
   }