2 files changed, 7 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/node_leak_test.cc b/webkit/tools/test_shell/node_leak_test.cc
index 6d303f1..7dee5aa 100644
--- a/webkit/tools/test_shell/node_leak_test.cc
+++ b/webkit/tools/test_shell/node_leak_test.cc
@@ -5,6 +5,7 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
+#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
@@ -42,9 +43,9 @@ class NodeLeakTest : public TestShellTest {
     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())));
-      if (timeout_ms > 0)
+      int timeout_ms;
+      if (base::StringToInt(WideToUTF8(timeout_str), &timeout_ms) &&
+          timeout_ms > 0)
         TestShell::SetFileTestTimeout(timeout_ms);
     }
 
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 6d9bac7..8eb549e 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -16,6 +16,7 @@
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/stats_table.h"
+#include "base/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
@@ -261,8 +262,8 @@ int main(int argc, char* argv[]) {
 
   // truncate the random # to 32 bits for the benefit of Mac OS X, to
   // avoid tripping over its maximum shared memory segment name length
-  std::string stats_filename =
-      kStatsFilePrefix + Uint64ToString(base::RandUint64() & 0xFFFFFFFFL);
+  std::string stats_filename = kStatsFilePrefix +
+      base::Uint64ToString(base::RandUint64() & 0xFFFFFFFFL);
   RemoveSharedMemoryFile(stats_filename);
   StatsTable *table = new StatsTable(stats_filename,
       kStatsFileThreads,