diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 19:28:44 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 19:28:44 +0000 |
| commit | 528c56de01bbbd38788ed6cf8d2eea4c56cbe19e (patch) | |
| tree | ac4f7a001affd772c4ab89701d3d46109b5f9e19 /webkit/tools/test_shell | |
| parent | 5c86ada8d84f6e67d17b027d347052ef451241c4 (diff) | |
| download | chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.zip chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.tar.gz chromium_src-528c56de01bbbd38788ed6cf8d2eea4c56cbe19e.tar.bz2 | |
Move the number conversions from string_util to a new file.
Use the base namespace in the new file. Update callers.
I removed all wstring variants and also the string->number ones that ignore the return value. That encourages people to write code and forget about error handling.
TEST=included unit tests
BUG=none
Review URL: http://codereview.chromium.org/3056029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/node_leak_test.cc | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 5 |
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, |