Use GetSwitchValuePath.

webkit/tools/test_shell/test_shell_main.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/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 117 matching lines @@
 
   if (playback_mode)
     cache_mode = net::HttpCache::PLAYBACK;
   else if (record_mode)
     cache_mode = net::HttpCache::RECORD;
 
   if (layout_test_mode ||
       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.
   if (cache_path.empty() && !layout_test_mode) {
     PathService::Get(base::DIR_EXE, &cache_path);
     cache_path = cache_path.AppendASCII("cache");
   }
 
   // Initializing with a default context, which means no on-disk cookie DB,
   // and no support for directory listings.
@@ skipping 216 matching lines @@
 
   TestShell::ShutdownTestShell();
   TestShell::CleanupLogging();
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   StatsTable::set_current(NULL);
   delete table;
 
   return 0;
 }