Remove deprecated CommandLine(std::wstring) ctor.

chrome/test/ui/ui_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.
 
 #include "chrome/test/ui/ui_test.h"
 
 #include <set>
 #include <vector>
 
 #include "app/sql/connection.h"
@@ skipping 79 matching lines @@
 // slave process frustrating. By passing this in error dialogs are enabled.
 const char kEnableErrorDialogs[] = "enable-errdialogs";
 
 // Uncomment this line to have the spawned process wait for the debugger to
 // attach.  This only works on Windows.  On posix systems, you can set the
 // BROWSER_WRAPPER env variable to wrap the browser process.
 // #define WAIT_FOR_DEBUGGER_ON_OPEN 1
 
 UITest::UITest()
     : testing::Test(),
-      launch_arguments_(L""),
+      launch_arguments_(CommandLine::ARGUMENTS_ONLY),
       expected_errors_(0),
       expected_crashes_(0),
       homepage_(L"about:blank"),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       process_(0),  // NULL on Windows, 0 PID on POSIX.
       process_id_(-1),
       show_window_(false),
       clear_profile_(true),
       include_testing_id_(true),
@@ skipping 139 matching lines @@
 static CommandLine* CreatePythonCommandLine() {
 #if defined(OS_WIN)
   // Get path to python interpreter
   FilePath python_runtime;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &python_runtime))
     return NULL;
   python_runtime = python_runtime
       .Append(FILE_PATH_LITERAL("third_party"))
       .Append(FILE_PATH_LITERAL("python_24"))
       .Append(FILE_PATH_LITERAL("python.exe"));
-  return new CommandLine(python_runtime.ToWStringHack());
+  return new CommandLine(python_runtime);
 #elif defined(OS_POSIX)
-  return new CommandLine(L"python");
+  return new CommandLine(FilePath("python"));
 #endif
 }
 
 static CommandLine* CreateHttpServerCommandLine() {
   FilePath src_path;
   // Get to 'src' dir.
   PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
 
   FilePath script_path(src_path);
   script_path = script_path.AppendASCII("webkit");
@@ skipping 730 matching lines @@
     }
   }
   if (delete_generated_file)
     EXPECT_TRUE(file_util::DieFileDie(generated_file, false));
 }
 
 bool UITest::LaunchBrowserHelper(const CommandLine& arguments,
                                  bool use_existing_browser,
                                  bool wait,
                                  base::ProcessHandle* process) {
-  FilePath command = browser_directory_;
-  command = command.Append(FilePath::FromWStringHack(
-      chrome::kBrowserProcessExecutablePath));
-  CommandLine command_line(command.ToWStringHack());
+  FilePath command = browser_directory_.Append(
+      FilePath::FromWStringHack(chrome::kBrowserProcessExecutablePath));
+  CommandLine command_line(command);
 
   // Add any explicit command line flags passed to the process.
   std::wstring extra_chrome_flags =
       CommandLine::ForCurrentProcess()->GetSwitchValue(kExtraChromeFlagsSwitch);
   if (!extra_chrome_flags.empty()) {
     // Split by spaces and append to command line
     std::vector<std::wstring> flags;
     SplitString(extra_chrome_flags, ' ', &flags);
     for (size_t i = 0; i < flags.size(); ++i)
       command_line.AppendLooseValue(flags[i]);
@@ skipping 145 matching lines @@
   std::string yesterday_str = Int64ToString(yesterday.ToInternalValue());
   std::string query = StringPrintf(
       "UPDATE segment_usage "
       "SET time_slot = %s "
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);",
       yesterday_str.c_str());
   ASSERT_TRUE(db.Execute(query.c_str()));
   db.Close();
   file_util::EvictFileFromSystemCache(history);
 }