Remove deprecated CommandLine(std::wstring) ctor.

Add a ctor for creating a CommandLine for carrying arguments;
convert all the users to either that or the FilePath version.

BUG=24672

Review URL: http://codereview.chromium.org/329017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30117 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 15 deletions

diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index a8d29b0..6187dfb 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -389,7 +389,7 @@ class AutomationProxyTest2 : public AutomationProxyVisibleTest {
     document1_= test_data_directory_.AppendASCII("title1.html");
 
     document2_ = test_data_directory_.AppendASCII("title2.html");
-    launch_arguments_ = CommandLine(L"");
+    launch_arguments_ = CommandLine(CommandLine::ARGUMENTS_ONLY);
     launch_arguments_.AppendLooseValue(document1_.ToWStringHack());
     launch_arguments_.AppendLooseValue(document2_.ToWStringHack());
   }
@@ -570,7 +570,7 @@ class AutomationProxyTest3 : public UITest {
     document1_ = document1_.AppendASCII("frame_dom_access.html");
 
     dom_automation_enabled_ = true;
-    launch_arguments_ = CommandLine(L"");
+    launch_arguments_ = CommandLine(CommandLine::ARGUMENTS_ONLY);
     launch_arguments_.AppendLooseValue(document1_.ToWStringHack());
   }
 
diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index a5e6625..4df7423 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -726,7 +726,7 @@ void SetPageRange(const CommandLine& parsed_command_line) {
       // 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.GetSwitchValue(switches::kJavaScriptFlags));
+            parsed_command_line.GetSwitchValuePath(switches::kJavaScriptFlags));
         if (v8_command_line.HasSwitch(kV8LogFileSwitch)) {
           g_v8_log_path = FilePath::FromWStringHack(
               v8_command_line.GetSwitchValue(kV8LogFileSwitch));
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index f80c845..ccd7da5 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -61,11 +61,7 @@ void RenderViewTest::LoadHTML(const char* html) {
 
 void RenderViewTest::SetUp() {
   sandbox_init_wrapper_.reset(new SandboxInitWrapper());
-#if defined(OS_WIN)
-  command_line_.reset(new CommandLine(std::wstring()));
-#elif defined(OS_POSIX)
-  command_line_.reset(new CommandLine(std::vector<std::string>()));
-#endif
+  command_line_.reset(new CommandLine(CommandLine::ARGUMENTS_ONLY));
   params_.reset(new MainFunctionParams(*command_line_, *sandbox_init_wrapper_,
                                        NULL));
   platform_.reset(new RendererMainPlatformDelegate(*params_));
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 725092a..e9ca10e 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -97,7 +97,7 @@ const char kEnableErrorDialogs[] = "enable-errdialogs";
 
 UITest::UITest()
     : testing::Test(),
-      launch_arguments_(L""),
+      launch_arguments_(CommandLine::ARGUMENTS_ONLY),
       expected_errors_(0),
       expected_crashes_(0),
       homepage_(L"about:blank"),
@@ -257,9 +257,9 @@ static CommandLine* CreatePythonCommandLine() {
       .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
 }
 
@@ -1010,10 +1010,9 @@ 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 =