Rename CommandLine::GetCommandLineString().

chrome/installer/util/google_chrome_distribution.cc

 // Copyright (c) 2011 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 defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
@@ skipping 122 matching lines @@
     // to do so. That is the process that needs the key.
     const CommandLine& current_cmd_line = *CommandLine::ForCurrentProcess();
     std::string key(installer::switches::kToastResultsKey);
     std::string toast_key = current_cmd_line.GetSwitchValueASCII(key);
     if (!toast_key.empty()) {
       cmd_line.AppendSwitchASCII(key, toast_key);
 
       // Use handle inheritance to make sure the duplicated toast results key
       // gets inherited by the child process.
       return base::LaunchAppWithHandleInheritance(
-          cmd_line.command_line_string(), false, false, NULL);
+          cmd_line.GetCommandLineString(), false, false, NULL);
     }
   }
 
-  return base::LaunchApp(cmd_line.command_line_string(),
+  return base::LaunchApp(cmd_line.GetCommandLineString(),
                          false, false, NULL);
 }
 
 // For System level installs, setup.exe lives in the system temp, which
 // is normally c:\windows\temp. In many cases files inside this folder
 // are not accessible for execution by regular user accounts.
 // This function changes the permisions so that any authenticated user
 // can launch |exe| later on. This function should only be called if the
 // code is running at the system level.
 bool FixDACLsForExecute(const FilePath& exe) {
@@ skipping 67 matching lines @@
 
   DWORD console_id = ::WTSGetActiveConsoleSessionId();
   if (console_id == 0xFFFFFFFF)
     return false;
   HANDLE user_token;
   if (!::WTSQueryUserToken(console_id, &user_token))
     return false;
   // Note: Handle inheritance must be true in order for the child process to be
   // able to use the duplicated handle above (Google Update results).
   bool launched = base::LaunchAppAsUser(user_token,
-                                        cmd_line.command_line_string(),
+                                        cmd_line.GetCommandLineString(),
                                         false, NULL, true, true);
   ::CloseHandle(user_token);
   return launched;
 }
 
 // The plugin infobar experiment is just setting the client registry value
 // to one of four possible values from 10% of the elegible population, which
 // is defined as active users that have opted-in for sending stats.
 // Chrome reads this value and modifies the plugin blocking and infobar
 // behavior accordingly.
@@ skipping 513 matching lines @@
   options.AppendSwitchNative(switches::kTryChromeAgain,
       base::IntToString16(flavor));
   if (has_welcome_url) {
     // Prepend the url with a space.
     std::wstring url(GetWelcomeBackUrl());
     options.AppendArg("--");
     options.AppendArgNative(url);
     // The command line should now have the url added as:
     // "chrome.exe -- <url>"
     DCHECK_NE(std::wstring::npos,
-        options.command_line_string().find(L" -- " + url));
+        options.GetCommandLineString().find(L" -- " + url));
   }
   // Launch chrome now. It will show the toast UI.
   int32 exit_code = 0;
   if (!installation.LaunchChromeAndWait(application_path, options, &exit_code))
     return;
 
   // The chrome process has exited, figure out what happened.
   const wchar_t* outcome = NULL;
   switch (exit_code) {
     case ResultCodes::NORMAL_EXIT:
@@ skipping 19 matching lines @@
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
       installer::switches::kSystemLevelToast);
 
   CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
                                                      GetType()));
   base::LaunchProcess(cmd, base::LaunchOptions());
 }
 #endif