Put SxS switches back into the rename command.

chrome/installer/setup/install_worker.cc

Index: chrome/installer/setup/install_worker.cc
===================================================================
--- chrome/installer/setup/install_worker.cc	(revision 84779)
+++ chrome/installer/setup/install_worker.cc	(working copy)
@@ -144,7 +144,7 @@
     for (size_t i = 0; i < products.size(); ++i) {
       const Product& p = *products[i];
       if (!p.is_chrome() && !p.ShouldCreateUninstallEntry())
-        p.AppendProductFlags(&uninstall_arguments);
+        p.AppendUninstallFlags(&uninstall_arguments);
     }
   }
 
@@ -423,8 +423,6 @@
     rename.AppendSwitch(switches::kRenameChromeExe);
     if (installer_state.system_install())
       rename.AppendSwitch(switches::kSystemLevel);
-    if (installer_state.is_multi_install())
-      rename.AppendSwitch(switches::kMultiInstall);
 
     if (installer_state.verbose_logging())
       rename.AppendSwitch(switches::kVerboseLogging);
@@ -445,11 +443,13 @@
       // 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,
-          rename.command_line_string(),
+          product_rename_cmd.command_line_string(),
           true);
     }
 
@@ -873,7 +873,7 @@
   uninstall_cmd->AppendSwitch(installer::switches::kUninstall);
 
   // Append the product-specific uninstall flags.
-  product.AppendProductFlags(uninstall_cmd);
+  product.AppendUninstallFlags(uninstall_cmd);
   if (installer_state.is_msi()) {
     uninstall_cmd->AppendSwitch(installer::switches::kMsi);
     // See comment in uninstall.cc where we check for the kDeleteProfile switch.