Add product-specific flags to the rename command in the registry. This fixes...

chrome/installer/setup/install_worker.cc

Index: chrome/installer/setup/install_worker.cc
===================================================================
--- chrome/installer/setup/install_worker.cc	(revision 75392)
+++ chrome/installer/setup/install_worker.cc	(working copy)
@@ -430,16 +430,13 @@
         .Append(setup_path.BaseName()));
 
     CommandLine rename(installer_path);
-    rename.AppendSwitch(installer::switches::kRenameChromeExe);
+    rename.AppendSwitch(switches::kRenameChromeExe);
     if (installer_state.system_install())
-      rename.AppendSwitch(installer::switches::kSystemLevel);
+      rename.AppendSwitch(switches::kSystemLevel);
 
-    if (InstallUtil::IsChromeSxSProcess())
-      rename.AppendSwitch(installer::switches::kChromeSxS);

[tommi (sloooow) - chröme, 2011/02/18 18:23:38]

why are we removing the sxs and multi-install switches?

[grt (UTC plus 2), 2011/02/18 18:30:06]

They're added by the ProductOperations subclasses.  We already had the code to
do the product-specific flags for the uninstall command, so we can reuse that
here.

+    if (installer_state.verbose_logging())
+      rename.AppendSwitch(switches::kVerboseLogging);

[tommi (sloooow) - chröme, 2011/02/18 18:23:38]

nice

[grt (UTC plus 2), 2011/02/18 18:30:06]

Thanks.

 
-    if (installer_state.is_multi_install())
-      rename.AppendSwitch(installer::switches::kMultiInstall);
-
     std::wstring version_key;
     for (size_t i = 0; i < products.size(); ++i) {
       BrowserDistribution* dist = products[i]->distribution();
@@ -456,11 +453,13 @@
       // will check the key and run the command, so we add it for all.
       // After the first run, the subsequent runs should just be noops.
       // (see Upgrade::SwapNewChromeExeIfPresent).
+      CommandLine product_rename_cmd(rename);
+      products[i]->AppendProductFlags(&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);
     }