Use GetSwitchValuePath.

webkit/tools/test_shell/node_leak_test.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 14 matching lines @@
 // can be printed upon termination.  This is only enabled in debug builds, so
 // it only makes sense to run this using a debug build.
 //
 // It will load a URL, visit about:blank, and then perform garbage collection.
 // The number of remaining (potentially leaked) nodes will be printed on exit.
 class NodeLeakTest : public TestShellTest {
  public:
   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");
     }
 
     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())));
@@ skipping 21 matching lines @@
     test_shell_->LoadURL(GURL(WideToUTF8(test_url)));
     test_shell_->WaitTestFinished();
 
     // Depends on TestShellTests::TearDown to load blank page and
     // the TestShell destructor to call garbage collection.
   }
 };
 
 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