Fix multi-install update regression.

chrome/installer/setup/install_worker.cc

 // Copyright (c) 2012 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 <oaidl.h>
@@ skipping 364 matching lines @@
     const HKEY root_key = installer_state.root_key();
     std::wstring multi_key(
         installer_state.multi_package_binaries_distribution()->GetStateKey());
 
     // Copy the value from the product with the greatest value.
     bool have_eula_accepted = false;
     BrowserDistribution::Type product_type;
     DWORD eula_accepted;
     const Products& products = installer_state.products();
     for (size_t i = 0, count = products.size(); i != count; ++i) {
+      if (products[i]->is_chrome_binaries())

[grt (UTC plus 2), 2012/07/24 15:02:03]

values are copied from products into the binaries, so we skip over the binaries
here.

+        continue;
       DWORD dword_value = 0;
       BrowserDistribution::Type this_type =
           products[i]->distribution()->GetType();
       const ProductState* product_state =
           original_state.GetNonVersionedProductState(
               system_install, this_type);
       if (product_state->GetEulaAccepted(&dword_value) &&
           (!have_eula_accepted || dword_value > eula_accepted)) {
         have_eula_accepted = true;
         eula_accepted = dword_value;
@@ skipping 234 matching lines @@
       }
       if (critical_version.IsValid()) {
         in_use_update_work_items->AddSetRegValueWorkItem(root, version_key,
             google_update::kRegCriticalVersionField,
             ASCIIToWide(critical_version.GetString()), true);
       } else {
         in_use_update_work_items->AddDeleteRegValueWorkItem(root, version_key,
             google_update::kRegCriticalVersionField);
       }
 
-      // 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.  The
-      // first to run it will perform the operation and clean up the other
+      // Adding this registry entry for all products (but the binaries) is
+      // overkill. However, as it stands, we don't have a way to know which
+      // product 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,
-          product_rename_cmd.GetCommandLineString(), true);
-    }
-
-    if (current_version != NULL && installer_state.is_multi_install()) {

[grt (UTC plus 2), 2012/07/24 15:02:03]

the binaries are in the set of products now, so this extra handling is no longer
needed.

-      BrowserDistribution* dist =
-          installer_state.multi_package_binaries_distribution();
-      version_key = dist->GetVersionKey();
-      in_use_update_work_items->AddSetRegValueWorkItem(
-          root, version_key, google_update::kRegOldVersionField,
-          ASCIIToWide(current_version->GetString()), true);
-      if (critical_version.IsValid()) {
+      if (dist->GetType() != BrowserDistribution::CHROME_BINARIES) {
+        CommandLine product_rename_cmd(rename);
+        products[i]->AppendRenameFlags(&product_rename_cmd);
         in_use_update_work_items->AddSetRegValueWorkItem(
-            root, version_key, google_update::kRegCriticalVersionField,
-            ASCIIToWide(critical_version.GetString()), true);
-      } else {
-        in_use_update_work_items->AddDeleteRegValueWorkItem(
-            root, version_key, google_update::kRegCriticalVersionField);
+            root, version_key, google_update::kRegRenameCmdField,
+            product_rename_cmd.GetCommandLineString(), true);
       }
-      // TODO(tommi): We should move the rename command here. We also need to
-      // update upgrade_utils::SwapNewChromeExeIfPresent.
     }
 
     if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) {
       AddCopyIELowRightsPolicyWorkItems(installer_state,
                                         in_use_update_work_items.get());
     }
 
     post_install_task_list->AddWorkItem(in_use_update_work_items.release());
   }
 
@@ skipping 32 matching lines @@
   if (installer_state.is_msi()) {
     for (size_t i = 0; i < products.size(); ++i) {
       const Product* product = products[i];
       AddSetMsiMarkerWorkItem(installer_state, product->distribution(), true,
                               post_install_task_list);
 
       // We want MSI installs to take over the Add/Remove Programs shortcut.
       // Make a best-effort attempt to delete any shortcuts left over from
       // previous non-MSI installations for the same type of install (system or
       // per user).
-      AddDeleteUninstallShortcutsForMSIWorkItems(installer_state, *product,
-                                                 temp_path,
-                                                 post_install_task_list);
-    }
-    if (installer_state.is_multi_install()) {

[grt (UTC plus 2), 2012/07/24 15:02:03]

the binaries are in the set of products now, so this extra handling is no longer
needed.

-      AddSetMsiMarkerWorkItem(installer_state,
-          installer_state.multi_package_binaries_distribution(), true,
-          post_install_task_list);
+      if (product->ShouldCreateUninstallEntry()) {
+        AddDeleteUninstallShortcutsForMSIWorkItems(installer_state, *product,
+                                                   temp_path,
+                                                   post_install_task_list);
+      }
     }
   }
 
   return true;
 }
 
 void AddChromeWorkItems(const InstallationState& original_state,
                         const InstallerState& installer_state,
                         const FilePath& setup_path,
                         const FilePath& archive_path,
@@ skipping 853 matching lines @@
                                  machine_state,
                                  setup_path,
                                  new_version,
                                  work_item_list,
                                  false,  // have_child_product
                                  cmd_line,
                                  kCmdQuickEnableApplicationHost);
 }
 
 }  // namespace installer