Rename CommandLine::GetCommandLineString().

chrome/installer/setup/install_worker.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 contains the definitions of the installer functions that build
 // the WorkItemList used to install the application.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <shlobj.h>
@@ skipping 138 matching lines @@
         p.AppendUninstallFlags(&uninstall_arguments);
     }
   }
 
   std::wstring update_state_key(browser_dist->GetStateKey());
   install_list->AddCreateRegKeyWorkItem(reg_root, update_state_key);
   install_list->AddSetRegValueWorkItem(reg_root, update_state_key,
       installer::kUninstallStringField, installer_path.value(), true);
   install_list->AddSetRegValueWorkItem(reg_root, update_state_key,
       installer::kUninstallArgumentsField,
-      uninstall_arguments.command_line_string(), true);
+      uninstall_arguments.GetCommandLineString(), true);
 
   // MSI installations will manage their own uninstall shortcuts.
   if (!installer_state.is_msi() && product.ShouldCreateUninstallEntry()) {
     // We need to quote the command line for the Add/Remove Programs dialog.
     CommandLine quoted_uninstall_cmd(installer_path);
-    DCHECK_EQ(quoted_uninstall_cmd.command_line_string()[0], '"');
+    DCHECK_EQ(quoted_uninstall_cmd.GetCommandLineString()[0], '"');
     quoted_uninstall_cmd.AppendArguments(uninstall_arguments, false);
 
     std::wstring uninstall_reg = browser_dist->GetUninstallRegPath();
     install_list->AddCreateRegKeyWorkItem(reg_root, uninstall_reg);
     install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
         installer::kUninstallDisplayNameField,
         browser_dist->GetAppShortCutName(), true);
     install_list->AddSetRegValueWorkItem(reg_root,
         uninstall_reg, installer::kUninstallStringField,
-        quoted_uninstall_cmd.command_line_string(), true);
+        quoted_uninstall_cmd.GetCommandLineString(), true);
     install_list->AddSetRegValueWorkItem(reg_root,
                                          uninstall_reg,
                                          L"InstallLocation",
                                          install_path.value(),
                                          true);
 
     // DisplayIcon, NoModify and NoRepair
     FilePath chrome_icon(install_path.Append(installer::kChromeExe));
     ShellUtil::GetChromeIcon(product.distribution(), chrome_icon.value());
     install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
@@ skipping 372 matching lines @@
       // However, as it stands, we don't have a way to know which distribution
       // will check the key and run the command, so we add it for all.  The
       // first to run it will perform the operation and clean up the other
       // values.
       CommandLine product_rename_cmd(rename);
       products[i]->AppendRenameFlags(&product_rename_cmd);
       in_use_update_work_items->AddSetRegValueWorkItem(
           root,
           version_key,
           google_update::kRegRenameCmdField,
-          product_rename_cmd.command_line_string(),
+          product_rename_cmd.GetCommandLineString(),
           true);
     }
 
     if (current_version != NULL && installer_state.is_multi_install()) {
       BrowserDistribution* dist =
           installer_state.multi_package_binaries_distribution();
       in_use_update_work_items->AddSetRegValueWorkItem(
           root,
           dist->GetVersionKey(),
           google_update::kRegOldVersionField,
@@ skipping 263 matching lines @@
       CommandLine opt_out(installer_path);
       AppendUninstallCommandLineFlags(installer_state, product, &opt_out);
       // Force Uninstall silences the prompt to reboot to complete uninstall.
       opt_out.AppendSwitch(switches::kForceUninstall);
 
       CommandLine opt_in(basic_cl);
       opt_in.AppendSwitch(switches::kChromeFrameReadyModeOptIn);
 
       list->AddSetRegValueWorkItem(root, version_key,
                                    google_update::kRegCFTempOptOutCmdField,
-                                   temp_opt_out.command_line_string(), true);
+                                   temp_opt_out.GetCommandLineString(), true);
       list->AddSetRegValueWorkItem(root, version_key,
                                    google_update::kRegCFEndTempOptOutCmdField,
-                                   end_temp_opt_out.command_line_string(),
+                                   end_temp_opt_out.GetCommandLineString(),
                                    true);
       list->AddSetRegValueWorkItem(root, version_key,
                                    google_update::kRegCFOptOutCmdField,
-                                   opt_out.command_line_string(), true);
+                                   opt_out.GetCommandLineString(), true);
       list->AddSetRegValueWorkItem(root, version_key,
                                    google_update::kRegCFOptInCmdField,
-                                   opt_in.command_line_string(), true);
+                                   opt_in.GetCommandLineString(), true);
     } else {
       // If Chrome is not also being uninstalled, we need to update its command
       // line so that it doesn't include uninstalling Chrome Frame now.
       update_chrome_uninstall_command =
           (installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER) ==
            NULL);
     }
   } else {
     // It doesn't matter here if we're installing or uninstalling Chrome Frame.
     // If ready mode isn't specified on the command line for installs, we need
@@ skipping 277 matching lines @@
 
     if (operation == ADD_COMMAND) {
       DCHECK(!binaries_setup_path.empty());
       CommandLine cmd_line(binaries_setup_path);
       cmd_line.AppendSwitch(switches::kMultiInstall);
       if (installer_state.system_install())
         cmd_line.AppendSwitch(switches::kSystemLevel);
       if (installer_state.verbose_logging())
         cmd_line.AppendSwitch(switches::kVerboseLogging);
       cmd_line.AppendSwitch(switches::kChromeFrameQuickEnable);
-      AppCommand cmd(cmd_line.command_line_string(), true, true);
+      AppCommand cmd(cmd_line.GetCommandLineString(), true, true);
       cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list);
     } else {
       DCHECK(operation == REMOVE_COMMAND);
       work_item_list->AddDeleteRegKeyWorkItem(installer_state.root_key(),
                                               cmd_key)->set_log_message(
           "removing quick-enable-cf command");
     }
   }
 }
 
 }  // namespace installer