Attempt to reland http://codereview.chromium.org/4928002/...

chrome/installer/setup/install.cc

 // Copyright (c) 2010 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/installer/setup/install.h"
 
 #include <shlobj.h>
 #include <time.h>
 
 #include "base/command_line.h"
@@ skipping 64 matching lines @@
   install_list->AddCopyTreeWorkItem(exe_path, exe_dst, temp_path,
                                     WorkItem::ALWAYS);
   if (system_level) {
     install_list->AddCopyTreeWorkItem(archive_path, archive_dst, temp_path,
                                       WorkItem::ALWAYS);
   } else {
     install_list->AddMoveTreeWorkItem(archive_path, archive_dst, temp_path);
   }
 }
 
-// A little helper function to save on tons of WideToASCII call sites.
-void AppendWideSwitch(CommandLine* cmd, const wchar_t* switch_name) {
-  cmd->AppendSwitch(WideToASCII(switch_name));
-}
-
 void AppendUninstallCommandLineFlags(CommandLine* uninstall_cmd,
                                      bool is_system) {
   DCHECK(uninstall_cmd);
-  AppendWideSwitch(uninstall_cmd, installer_util::switches::kUninstall);
+  uninstall_cmd->AppendSwitch(installer_util::switches::kUninstall);
 
   // TODO(tommi): In case of multiple installations, we need to create multiple
   // uninstall entries, and not one magic one for all.
   const installer_util::MasterPreferences& prefs =
       InstallUtil::GetMasterPreferencesForCurrentProcess();
   DCHECK(!prefs.is_multi_install());
 
   if (prefs.install_chrome_frame()) {
-    AppendWideSwitch(uninstall_cmd, installer_util::switches::kDeleteProfile);
-    AppendWideSwitch(uninstall_cmd, installer_util::switches::kChromeFrame);
+    uninstall_cmd->AppendSwitch(installer_util::switches::kDeleteProfile);
+    uninstall_cmd->AppendSwitch(installer_util::switches::kChromeFrame);
   }
 
   if (InstallUtil::IsChromeSxSProcess()) {
-    AppendWideSwitch(uninstall_cmd, installer_util::switches::kChromeSxS);
+    uninstall_cmd->AppendSwitch(installer_util::switches::kChromeSxS);
   }
 
   if (InstallUtil::IsMSIProcess(is_system)) {
-    AppendWideSwitch(uninstall_cmd, installer_util::switches::kMsi);
+    uninstall_cmd->AppendSwitch(installer_util::switches::kMsi);
   }
 
   // Propagate the verbose logging switch to uninstalls too.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(installer_util::switches::kVerboseLogging)) {
-    AppendWideSwitch(uninstall_cmd, installer_util::switches::kVerboseLogging);
+    uninstall_cmd->AppendSwitch(installer_util::switches::kVerboseLogging);
   }
 
   if (is_system) {
-    AppendWideSwitch(uninstall_cmd, installer_util::switches::kSystemLevel);
+    uninstall_cmd->AppendSwitch(installer_util::switches::kSystemLevel);
   }
 }
 
 // This method adds work items to create (or update) Chrome uninstall entry in
 // either the Control Panel->Add/Remove Programs list or in the Omaha client
 // state key if running under an MSI installer.
 void AddUninstallShortcutWorkItems(HKEY reg_root,
                                    const std::wstring& exe_path,
                                    const std::wstring& install_path,
                                    const std::wstring& product_name,
@@ skipping 281 matching lines @@
     if (current_version.empty()) {
       LOG(ERROR) << "New chrome.exe exists but current version is empty!";
       return false;
     }
     scoped_ptr<WorkItemList> inuse_list(WorkItem::CreateWorkItemList());
     inuse_list->AddSetRegValueWorkItem(reg_root,
                                        version_key,
                                        google_update::kRegOldVersionField,
                                        current_version.c_str(),
                                        true);
+    FilePath installer_path(installer::GetInstallerPathUnderChrome(install_path,
+        new_version.GetString()));
+    installer_path = installer_path.Append(
+        file_util::GetFilenameFromPath(exe_path));
 
-    std::wstring rename_cmd(installer::GetInstallerPathUnderChrome(
-        install_path, new_version.GetString()));
-    file_util::AppendToPath(&rename_cmd,
-                            file_util::GetFilenameFromPath(exe_path));
-    rename_cmd = L"\"" + rename_cmd +
-                 L"\" --" + installer_util::switches::kRenameChromeExe;
+    CommandLine rename_cmd(installer_path);
+    rename_cmd.AppendSwitch(installer_util::switches::kRenameChromeExe);
     if (is_system_install)
-      rename_cmd = rename_cmd + L" --" + installer_util::switches::kSystemLevel;
+      rename_cmd.AppendSwitch(installer_util::switches::kSystemLevel);
 
-    if (prefs.install_chrome_frame()) {
-      rename_cmd += L" --";
-      rename_cmd += installer_util::switches::kChromeFrame;
-    }
+    if (prefs.install_chrome_frame())
+      rename_cmd.AppendSwitch(installer_util::switches::kChromeFrame);
 
-    if (InstallUtil::IsChromeSxSProcess()) {
-      rename_cmd += L" --";
-      rename_cmd += installer_util::switches::kChromeSxS;
-    }
+    if (InstallUtil::IsChromeSxSProcess())
+      rename_cmd.AppendSwitch(installer_util::switches::kChromeSxS);
 
     inuse_list->AddSetRegValueWorkItem(reg_root,
                                        version_key,
                                        google_update::kRegRenameCmdField,
-                                       rename_cmd.c_str(),
+                                       rename_cmd.command_line_string(),
                                        true);
     if (!inuse_list->Do()) {
       LOG(ERROR) << "Couldn't write opv/cmd values to registry.";
       inuse_list->Rollback();
       return false;
     }
   } else {
     // Since this was not in-use-update, delete 'opv' and 'cmd' keys.
     scoped_ptr<WorkItemList> inuse_list(WorkItem::CreateWorkItemList());
     inuse_list->AddDeleteRegValueWorkItem(reg_root, version_key,
@@ skipping 354 matching lines @@
     }
 
     std::wstring latest_version_to_keep(new_version.GetString());
     if (!current_version.empty())
       latest_version_to_keep.assign(current_version);
     RemoveOldVersionDirs(install_path, latest_version_to_keep);
   }
 
   return result;
 }