summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/node_leak_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/test_shell/node_leak_test.cc')
-rw-r--r--webkit/tools/test_shell/node_leak_test.cc7
1 files changed, 4 insertions, 3 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);
}