Merge 75412 - Add product-specific flags to the rename command in the registr...

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 415 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(package.GetInstallerDirectory(new_version)
         .Append(setup_path.BaseName()));
 
     CommandLine rename(installer_path);
-    rename.AppendSwitch(installer::switches::kRenameChromeExe);
+    rename.AppendSwitch(switches::kRenameChromeExe);
     if (package.system_level())
-      rename.AppendSwitch(installer::switches::kSystemLevel);
-
-    if (InstallUtil::IsChromeSxSProcess())
-      rename.AppendSwitch(installer::switches::kChromeSxS);
+      rename.AppendSwitch(switches::kSystemLevel);
 
     if (multi_install)
-      rename.AppendSwitch(installer::switches::kMultiInstall);
+      rename.AppendSwitch(switches::kMultiInstall);
+
+    const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
+    bool value = false;
+    if (prefs.GetBool(master_preferences::kVerboseLogging, &value) && value)
+      rename.AppendSwitch(switches::kVerboseLogging);
 
     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).
+      // We use the same mechanism used for the uninstall command, whereby we
+      // delegate to the BrowserDistribution class to add product-specific
+      // switches to the command line.  A better name for this method would be
+      // AppendProductSpecificCommandLineFlags, or something like that.  In the
+      // interest of keeping this merge simple, we'll leave the name as-is.  On
+      // trunk, things have been refactored so this isn't quite so misleading.
+      CommandLine product_rename_cmd(rename);
+      dist->AppendUninstallCommandLineFlags(&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 (multi_install) {
       PackageProperties* props = package.properties();
       if (props->ReceivesUpdates() && current_version != NULL) {
         in_use_update_work_items->AddSetRegValueWorkItem(
             root,
             props->GetVersionKey(),
             google_update::kRegOldVersionField,
@@ skipping 376 matching lines @@
   if (prefs.is_multi_install()) {
     uninstall_cmd->AppendSwitch(installer::switches::kMultiInstall);
   }
   bool value = false;
   if (prefs.GetBool(installer::master_preferences::kVerboseLogging,
                     &value) && value)
     uninstall_cmd->AppendSwitch(installer::switches::kVerboseLogging);
 }
 
 }  // namespace installer