Use GetSwitchValuePath.

chrome/test/reliability/page_load_test.cc

 // Copyright (c) 2006-2009 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.
 //
 // This file provides reliablity test which runs under UI test framework. The
 // test is intended to run within QEMU environment.
 //
 // Usage 1: reliability_test
 // Upon invocation, it visits a hard coded list of sample URLs. This is mainly
 // used by buildbot, to verify reliability_test itself runs ok.
@@ skipping 649 matching lines @@
 
   if (parsed_command_line.HasSwitch(kEndIndexSwitch)) {
     ASSERT_TRUE(
         StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
             kEndIndexSwitch)), &g_end_index));
     ASSERT_GT(g_end_index, 0);
   }
 
   ASSERT_TRUE(g_end_index >= g_start_index);
 
-  if (parsed_command_line.HasSwitch(kListSwitch)) {
-    g_url_file_path = FilePath::FromWStringHack(
-        parsed_command_line.GetSwitchValue(kListSwitch));
-  }
+  if (parsed_command_line.HasSwitch(kListSwitch))
+    g_url_file_path = parsed_command_line.GetSwitchValuePath(kListSwitch);
 
   if (parsed_command_line.HasSwitch(kIterationSwitch)) {
     ASSERT_TRUE(
         StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
             kIterationSwitch)), &g_iterations));
     ASSERT_GT(g_iterations, 0);
   }
 
   if (parsed_command_line.HasSwitch(kMemoryUsageSwitch))
     g_memory_usage = true;
 
   if (parsed_command_line.HasSwitch(kContinuousLoadSwitch))
     g_continuous_load = true;
 
   if (parsed_command_line.HasSwitch(kEndURLSwitch)) {
     g_end_url = WideToUTF8(
         parsed_command_line.GetSwitchValue(kEndURLSwitch));
   }
 
-  if (parsed_command_line.HasSwitch(kLogFileSwitch)) {
-    g_log_file_path =
-        FilePath::FromWStringHack(
-            parsed_command_line.GetSwitchValue(kLogFileSwitch));
-  }
+  if (parsed_command_line.HasSwitch(kLogFileSwitch))
+    g_log_file_path = parsed_command_line.GetSwitchValuePath(kLogFileSwitch);
 
   if (parsed_command_line.HasSwitch(kTimeoutSwitch)) {
     ASSERT_TRUE(
         StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
             kTimeoutSwitch)), &g_timeout_ms));
     ASSERT_GT(g_timeout_ms, 0);
   }
 
   if (parsed_command_line.HasSwitch(kNoPageDownSwitch))
     g_page_down = false;
 
   if (parsed_command_line.HasSwitch(kNoClearProfileSwitch))
     g_clear_profile = false;
 
   if (parsed_command_line.HasSwitch(kSaveDebugLogSwitch)) {
     g_save_debug_log = true;
     g_chrome_log_path = logging::GetLogFileName();
     // We won't get v8 log unless --no-sandbox is specified.
     if (parsed_command_line.HasSwitch(switches::kNoSandbox)) {
       PathService::Get(base::DIR_CURRENT, &g_v8_log_path);
       g_v8_log_path = g_v8_log_path.AppendASCII(kV8LogFileDefaultName);
       // The command line switch may override the default v8 log path.
       if (parsed_command_line.HasSwitch(switches::kJavaScriptFlags)) {
         CommandLine v8_command_line(
             parsed_command_line.GetSwitchValuePath(switches::kJavaScriptFlags));
         if (v8_command_line.HasSwitch(kV8LogFileSwitch)) {
-          g_v8_log_path = FilePath::FromWStringHack(
-              v8_command_line.GetSwitchValue(kV8LogFileSwitch));
-          if (!file_util::AbsolutePath(&g_v8_log_path)) {
+          g_v8_log_path = v8_command_line.GetSwitchValuePath(kV8LogFileSwitch);
+          if (!file_util::AbsolutePath(&g_v8_log_path))
             g_v8_log_path = FilePath();
-          }
         }
       }
     }
   }
 }