Add product-specific flags to the rename command in the registry. This fixes a regression that prevented in-place upgrades of Chrome Frame from working.

BUG=73329
TEST=Follow the steps in the bug.  Between steps 4 and 5, check that the "cmd" registry value in HKLM\Software\Google\Update\Clients\{8BA986DA-5100-405E-AA35-86F34A02ACBF} contains "--chrome-frame".

Review URL: http://codereview.chromium.org/6541029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75412 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 8 deletions

diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 0717a34..aaa8112 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -430,15 +430,12 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
         .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);
-
-    if (installer_state.is_multi_install())
-      rename.AppendSwitch(installer::switches::kMultiInstall);
+    if (installer_state.verbose_logging())
+      rename.AppendSwitch(switches::kVerboseLogging);
 
     std::wstring version_key;
     for (size_t i = 0; i < products.size(); ++i) {
@@ -456,11 +453,13 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
       // 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);
     }