Put SxS switches back into the rename command.

chrome/installer/util/chrome_browser_operations.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.
 
 #include "chrome/installer/util/chrome_browser_operations.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 32 matching lines @@
     std::vector<FilePath>* key_files) const {
   DCHECK(key_files);
   key_files->push_back(FilePath(installer::kChromeDll));
 }
 
 void ChromeBrowserOperations::AddComDllList(
     const std::set<std::wstring>& options,
     std::vector<FilePath>* com_dll_list) const {
 }
 
-void ChromeBrowserOperations::AppendProductFlags(
+void ChromeBrowserOperations::AppendUninstallFlags(
     const std::set<std::wstring>& options,
-    CommandLine* uninstall_command) const {
-  DCHECK(uninstall_command);
+    CommandLine* cmd_line) const {
+  DCHECK(cmd_line);
 
   if (options.find(kOptionMultiInstall) != options.end()) {
-    if (!uninstall_command->HasSwitch(switches::kMultiInstall))
-      uninstall_command->AppendSwitch(switches::kMultiInstall);
-    uninstall_command->AppendSwitch(switches::kChrome);
+    // Add --multi-install if it isn't already there.
+    if (!cmd_line->HasSwitch(switches::kMultiInstall))
+      cmd_line->AppendSwitch(switches::kMultiInstall);
+
+    // --chrome is only needed in multi-install.
+    cmd_line->AppendSwitch(switches::kChrome);
+  }
+}
+
+void ChromeBrowserOperations::AppendRenameFlags(
+    const std::set<std::wstring>& options,
+    CommandLine* cmd_line) const {
+  DCHECK(cmd_line);
+
+  // Add --multi-install if it isn't already there.
+  if (options.find(kOptionMultiInstall) != options.end() &&
+      !cmd_line->HasSwitch(switches::kMultiInstall)) {
+    cmd_line->AppendSwitch(switches::kMultiInstall);
   }
 }
 
 bool ChromeBrowserOperations::SetChannelFlags(
     const std::set<std::wstring>& options,
     bool set,
     ChannelInfo* channel_info) const {
 #if defined(GOOGLE_CHROME_BUILD)
   DCHECK(channel_info);
   return channel_info->SetChrome(set);
 #else
   return false;
 #endif
 }
 
 bool ChromeBrowserOperations::ShouldCreateUninstallEntry(
     const std::set<std::wstring>& options) const {
   return true;
 }
 
 }  // namespace installer