Fix multi-install update regression.

chrome/installer/util/chrome_binaries_operations.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.
 
 #include "chrome/installer/util/chrome_binaries_operations.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace installer {
 
 void ChromeBinariesOperations::ReadOptions(
     const MasterPreferences& prefs,
     std::set<std::wstring>* options) const {
   DCHECK(options);
-
-  bool pref_value;
-
-  if (prefs.GetBool(master_preferences::kMultiInstall, &pref_value) &&
-      pref_value) {
-    options->insert(kOptionMultiInstall);
-  }
+  options->insert(kOptionMultiInstall);

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

the binaries are inherently multi-install, so it's wrong to check the prefs.

 }
 
 void ChromeBinariesOperations::ReadOptions(
     const CommandLine& uninstall_command,
     std::set<std::wstring>* options) const {
   DCHECK(options);
-
-  if (uninstall_command.HasSwitch(switches::kMultiInstall))
-    options->insert(kOptionMultiInstall);
+  options->insert(kOptionMultiInstall);

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

the binaries are inherently multi-install, so it's wrong to check the cmd line,
which won't contain any flags for an update from an install that predates this
change.

 }
 
 void ChromeBinariesOperations::AddKeyFiles(
     const std::set<std::wstring>& options,
     std::vector<FilePath>* key_files) const {
   DCHECK(key_files);
   key_files->push_back(FilePath(installer::kChromeDll));
 }
 
 void ChromeBinariesOperations::AddComDllList(
     const std::set<std::wstring>& options,
     std::vector<FilePath>* com_dll_list) const {
 }
 
 void ChromeBinariesOperations::AppendProductFlags(
     const std::set<std::wstring>& options,
     CommandLine* cmd_line) const {
   DCHECK(cmd_line);
 
-  if (options.find(kOptionMultiInstall) != options.end()) {
-    // Add --multi-install if it isn't already there.
-    if (!cmd_line->HasSwitch(switches::kMultiInstall))
-      cmd_line->AppendSwitch(switches::kMultiInstall);
-  }
+  DCHECK(options.find(kOptionMultiInstall) != options.end());
+
+  // Add --multi-install if it isn't already there.
+  if (!cmd_line->HasSwitch(switches::kMultiInstall))
+    cmd_line->AppendSwitch(switches::kMultiInstall);
 }
 
 void ChromeBinariesOperations::AppendRenameFlags(
     const std::set<std::wstring>& options,
     CommandLine* cmd_line) const {
   DCHECK(cmd_line);
 
+  DCHECK(options.find(kOptionMultiInstall) != options.end());
+
   // Add --multi-install if it isn't already there.
-  if (options.find(kOptionMultiInstall) != options.end() &&
-      !cmd_line->HasSwitch(switches::kMultiInstall)) {
+  if (!cmd_line->HasSwitch(switches::kMultiInstall))
     cmd_line->AppendSwitch(switches::kMultiInstall);
-  }
 }
 
 bool ChromeBinariesOperations::SetChannelFlags(
     const std::set<std::wstring>& options,
     bool set,
     ChannelInfo* channel_info) const {
   return false;
 }
 
 bool ChromeBinariesOperations::ShouldCreateUninstallEntry(
     const std::set<std::wstring>& options) const {
   return false;
 }
 
 }  // namespace installer