CommandLine: eliminate wstring-accepting AppendLooseValue

Instead use AppendArg variants which accept a FilePath or an ASCII string.

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

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

6 files changed, 14 insertions, 18 deletions

diff --git a/chrome/browser/browser_init_browsertest.cc b/chrome/browser/browser_init_browsertest.cc
index b6ad563..b9f8514 100644
--- a/chrome/browser/browser_init_browsertest.cc
+++ b/chrome/browser/browser_init_browsertest.cc
@@ -66,13 +66,13 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, FLAKY_OpenURLsPopup) {
 // to start on most BuildBot runs and I don't want to add longer delays to
 // the test. I'll circle back and make this work properly when i get a chance.
 IN_PROC_BROWSER_TEST_F(BrowserInitTest, FLAKY_BlockBadURLs) {
-  const std::wstring testurlstr(L"http://localhost/");
-  const GURL testurl(WideToUTF16Hack(testurlstr));
+  const char* testurlstr = "http://localhost/";
+  const GURL testurl(testurlstr);
   CommandLine cmdline(CommandLine::ARGUMENTS_ONLY);
-  cmdline.AppendLooseValue(testurlstr);
-  cmdline.AppendLooseValue(std::wstring(L"javascript:alert('boo')"));
-  cmdline.AppendLooseValue(testurlstr);
-  cmdline.AppendLooseValue(std::wstring(L"view-source:http://localhost/"));
+  cmdline.AppendArg(testurlstr);
+  cmdline.AppendArg("javascript:alert('boo')");
+  cmdline.AppendArg(testurlstr);
+  cmdline.AppendArg("view-source:http://localhost/");
 
   // This will pick up the current browser instance.
   BrowserInit::LaunchWithProfile launch(FilePath(), cmdline);
diff --git a/chrome/browser/chromeos/login/apply_services_customization.cc b/chrome/browser/chromeos/login/apply_services_customization.cc
index d310d32..d455ded 100644
--- a/chrome/browser/chromeos/login/apply_services_customization.cc
+++ b/chrome/browser/chromeos/login/apply_services_customization.cc
@@ -136,8 +136,8 @@ void ApplyServicesCustomization::Apply(const std::string& manifest) {
   if (!customization.initial_start_page_url().empty()) {
     // Append partner's start page url to command line so it gets opened
     // on browser startup.
-    CommandLine::ForCurrentProcess()->AppendLooseValue(
-        UTF8ToWide(customization.initial_start_page_url()));
+    CommandLine::ForCurrentProcess()->AppendArg(
+        customization.initial_start_page_url());
     LOG(INFO) << "initial_start_page_url: "
               << customization.initial_start_page_url();
   }
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 2aa1ede..6907a3c 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -333,10 +333,8 @@ void ExistingUserController::OnLoginFailure(const std::string& error) {
 }
 
 void ExistingUserController::AppendStartUrlToCmdline() {
-  if (start_url_.is_valid()) {
-    CommandLine::ForCurrentProcess()->AppendLooseValue(
-        UTF8ToWide(start_url_.spec()));
-  }
+  if (start_url_.is_valid())
+    CommandLine::ForCurrentProcess()->AppendArg(start_url_.spec());
 }
 
 void ExistingUserController::ClearCaptchaState() {
diff --git a/chrome/browser/chromeos/login/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc
index ddd71df..f150163 100644
--- a/chrome/browser/chromeos/login/login_screen.cc
+++ b/chrome/browser/chromeos/login/login_screen.cc
@@ -104,10 +104,8 @@ void LoginScreen::OnOffTheRecordLoginSuccess() {
 }
 
 void LoginScreen::AppendStartUrlToCmdline() {
-  if (start_url_.is_valid()) {
-    CommandLine::ForCurrentProcess()->AppendLooseValue(
-        UTF8ToWide(start_url_.spec()));
-  }
+  if (start_url_.is_valid())
+    CommandLine::ForCurrentProcess()->AppendArg(start_url_.spec());
 }
 
 void LoginScreen::ShowError(int error_id, const std::string& details) {
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index eda8d60..9d6df17 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -205,7 +205,7 @@ void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) {
         switches::kLoginUser,
         UserManager::Get()->logged_in_user().email());
     if (start_url.is_valid())
-      command_line.AppendLooseValue(UTF8ToWide(start_url.spec()));
+      command_line.AppendArg(start_url.spec());
     CrosLibrary::Get()->GetLoginLibrary()->RestartJob(
         getpid(),
         command_line.command_line_string());
diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc
index 9b77d71..a770023 100644
--- a/chrome/browser/process_singleton_linux_uitest.cc
+++ b/chrome/browser/process_singleton_linux_uitest.cc
@@ -72,7 +72,7 @@ CommandLine CommandLineForUrl(const std::string& url) {
     cmd_line->AppendSwitch(switches::kNoProcessSingletonDialog);
 
   CommandLine new_cmd_line(*cmd_line);
-  new_cmd_line.AppendLooseValue(ASCIIToWide(url));
+  new_cmd_line.AppendArg(url);
   return new_cmd_line;
 }