diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 21:45:17 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 21:45:17 +0000 |
| commit | 9f308ae7b39912090955910e76753aa0823461e3 (patch) | |
| tree | 1600f6c38f3113c692e372e34701eb39b3e518c9 /webkit/tools/test_shell | |
| parent | a91d639d609db7e4c9ae2ccad3fe1039608c45ff (diff) | |
| download | chromium_src-9f308ae7b39912090955910e76753aa0823461e3.zip chromium_src-9f308ae7b39912090955910e76753aa0823461e3.tar.gz chromium_src-9f308ae7b39912090955910e76753aa0823461e3.tar.bz2 | |
Use GetSwitchValuePath.
BUG=24672
TEST=unit_tests
Patch by Thiago Farina <thiago.farina@gmail.com>.
Review URL: http://codereview.chromium.org/375016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32093 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 | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/node_leak_test.cc b/webkit/tools/test_shell/node_leak_test.cc index bfa0408..ded1f03 100644 --- a/webkit/tools/test_shell/node_leak_test.cc +++ b/webkit/tools/test_shell/node_leak_test.cc @@ -32,8 +32,8 @@ class NodeLeakTest : public TestShellTest { virtual void SetUp() { const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); - FilePath cache_path = FilePath::FromWStringHack( - parsed_command_line.GetSwitchValue(test_shell::kCacheDir)); + FilePath cache_path = + parsed_command_line.GetSwitchValuePath(test_shell::kCacheDir); if (cache_path.empty()) { PathService::Get(base::DIR_EXE, &cache_path); cache_path = cache_path.AppendASCII("cache"); @@ -75,9 +75,8 @@ class NodeLeakTest : public TestShellTest { TEST_F(NodeLeakTest, TestURL) { const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); - if (parsed_command_line.HasSwitch(kTestUrlSwitch)) { + if (parsed_command_line.HasSwitch(kTestUrlSwitch)) NavigateToURL(parsed_command_line.GetSwitchValue(kTestUrlSwitch).c_str()); - } } } // namespace diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index bd9a5b0..d3db465 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -135,8 +135,8 @@ int main(int argc, char* argv[]) { parsed_command_line.HasSwitch(test_shell::kEnableFileCookies)) net::CookieMonster::EnableFileScheme(); - FilePath cache_path = FilePath::FromWStringHack( - parsed_command_line.GetSwitchValue(test_shell::kCacheDir)); + FilePath cache_path = + parsed_command_line.GetSwitchValuePath(test_shell::kCacheDir); // If the cache_path is empty and it's layout_test_mode, leave it empty // so we use an in-memory cache. This makes running multiple test_shells // in parallel less flaky. |