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

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 412 matching lines @@
   {
     scoped_ptr<WorkItemList> in_use_update_work_items(
         WorkItem::CreateConditionalWorkItemList(
             new ConditionRunIfFileExists(new_chrome_exe)));
     in_use_update_work_items->set_log_message("InUseUpdateWorkItemList");
 
     FilePath installer_path(installer_state.GetInstallerDirectory(new_version)
         .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.is_multi_install())
-      rename.AppendSwitch(installer::switches::kMultiInstall);
+    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.

 
     std::wstring version_key;
     for (size_t i = 0; i < products.size(); ++i) {
       BrowserDistribution* dist = products[i]->distribution();
       version_key = dist->GetVersionKey();
 
       if (current_version != NULL) {
         in_use_update_work_items->AddSetRegValueWorkItem(root, version_key,
             google_update::kRegOldVersionField,
             UTF8ToWide(current_version->GetString()), true);
       }
 
       // Adding this registry entry for all products is overkill.
       // 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.
       // 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);
     }
 
     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 426 matching lines @@
       VLOG(1) << kIERefreshPolicy << " not supported.";
     }
 
     FreeLibrary(ieframe);
   } else {
     VLOG(1) << "Cannot load " << kIEFrameDll;
   }
 }
 
 }  // namespace installer