Remove multi-install from installer_util.

This cleanup CL:
- Removes InstallUtil::IsMultiInstall.
- Removes MasterPreferences::is_multi_install.
- Removes various multi-related constants.

BUG=577816

Review-Url: https://codereview.chromium.org/2594113002
Cr-Commit-Position: refs/heads/master@{#442894}

chrome/installer/util/install_util.cc

@@ -319,11 +319,6 @@ void InstallUtil::ResetIsPerUserInstallForTest() {
   env->UnSetVar(kEnvProgramFilesPath);
 }
 
-bool InstallUtil::IsMultiInstall(bool system_install) {
-  ProductState state;
-  return state.Initialize(system_install) && state.is_multi_install();
-}
-
 bool CheckIsChromeSxSProcess() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   CHECK(command_line);

chrome/installer/util/install_util.h

@@ -92,9 +92,6 @@ class InstallUtil {
   // with fresh data.
   static void ResetIsPerUserInstallForTest();
 
-  // Returns true if Chrome at |system_level| is a multi install.
-  static bool IsMultiInstall(bool system_install);
-
   // Returns true if this is running setup process for Chrome SxS (as
   // indicated by the presence of --chrome-sxs on the command line) or if this
   // is running Chrome process from the Chrome SxS installation (as indicated

chrome/installer/util/installation_state.cc

@@ -12,6 +12,7 @@
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/util_constants.h"
 
 namespace installer {
 
@@ -117,7 +118,7 @@ bool ProductState::Initialize(bool system_install) {
                             &dw_value) == ERROR_SUCCESS) && (dw_value != 0);
     // Multi-install is a legacy option that is read for the sole purpose of
     // migrating clients away from it.
-    multi_install_ = uninstall_command_.HasSwitch(switches::kMultiInstall);
+    multi_install_ = uninstall_command_.HasSwitch("multi-install");
   }
 
   // Read from the ClientStateMedium key.  Values here override those in

chrome/installer/util/master_preferences.cc

@@ -163,12 +163,10 @@ void MasterPreferences::InitializeFromCommandLine(
   }
 
   // Strip multi-install from the dictionary, if present. This ensures that any
-  // code that probes the dictionary directly to check for multi-install (rather
-  // than calling is_multi_install()) receives false. The updated dictionary is
-  // not written back to disk.
-  master_dictionary_->Remove(std::string(master_preferences::kDistroDict) +
-                                 '.' + master_preferences::kMultiInstall,
-                             nullptr);
+  // code that probes the dictionary directly to check for multi-install
+  // receives false. The updated dictionary is not written back to disk.
+  master_dictionary_->Remove(
+      std::string(master_preferences::kDistroDict) + ".multi_install", nullptr);
 
   // Cache a pointer to the distribution dictionary. Ignore errors if any.
   master_dictionary_->GetDictionary(installer::master_preferences::kDistroDict,

chrome/installer/util/master_preferences.h

@@ -170,8 +170,6 @@ class MasterPreferences {
     return preferences_read_from_file_;
   }
 
-  bool is_multi_install() const { return false; }
-
   // Returns a reference to this MasterPreferences' root dictionary of values.
   const base::DictionaryValue& master_dictionary() const {
     return *master_dictionary_.get();

chrome/installer/util/master_preferences_constants.cc

@@ -36,7 +36,6 @@ namespace master_preferences {
       "suppress_first_run_default_browser_prompt";
   const char kMsi[] = "msi";
   const char kMsiProductId[] = "msi_product_id";
-  const char kMultiInstall[] = "multi_install";
   const char kRequireEula[] = "require_eula";
   const char kSystemLevel[] = "system_level";
   const char kVerboseLogging[] = "verbose_logging";

chrome/installer/util/master_preferences_constants.h

@@ -75,8 +75,6 @@ extern const char kMsi[];
 // String. The MSI Product ID under which the MSI stores its information.  This
 // is used to update the DisplayVersion to match Chrome's version number.
 extern const char kMsiProductId[];
-// Boolean. Support installing multiple products at once.
-extern const char kMultiInstall[];
 // Boolean. Show EULA dialog before install.
 extern const char kRequireEula[];
 // Boolean. Indicates that the first-run 'set-as-default' dialog should not be

chrome/installer/util/master_preferences_unittest.cc

@@ -321,23 +321,6 @@ TEST_F(MasterPreferencesTest, TestDefaultInstallConfig) {
       base::CommandLine::FromString(chrome_cmd.str()));
 
   installer::MasterPreferences pref_chrome(chrome_install);
-
-  EXPECT_FALSE(pref_chrome.is_multi_install());
-}
-
-TEST_F(MasterPreferencesTest, TestMultiInstallIgnoredConfig) {
-  using installer::switches::kMultiInstall;
-  using installer::switches::kChrome;
-
-  std::wstringstream chrome_cmd, cf_cmd, chrome_cf_cmd;
-  chrome_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome;
-
-  base::CommandLine chrome_install(
-      base::CommandLine::FromString(chrome_cmd.str()));
-
-  installer::MasterPreferences pref_chrome(chrome_install);
-
-  EXPECT_FALSE(pref_chrome.is_multi_install());
 }
 
 TEST_F(MasterPreferencesTest, EnforceLegacyCreateAllShortcutsFalse) {

chrome/installer/util/util_constants.cc

@@ -8,10 +8,6 @@ namespace installer {
 
 namespace switches {
 
-// Install Chrome.
-// Currently this is only required when used in combination with kMultiInstall.
-const char kChrome[] = "chrome";
-
 // Run the installer for Chrome SxS.
 const char kChromeSxS[] = "chrome-sxs";
 
@@ -83,10 +79,6 @@ const char kMakeChromeDefault[] = "make-chrome-default";
 // Tells installer to expect to be run as a subsidiary to an MSI.
 const char kMsi[] = "msi";
 
-// Tells installer to install multiple products specified on the command line.
-// (e.g. Chrome Frame, Chrome)
-const char kMultiInstall[] = "multi-install";
-
 // Useful only when used with --update-setup-exe, otherwise ignored. It
 // specifies the full path where updated setup.exe will be stored.
 const char kNewSetupExe[] = "new-setup-exe";

chrome/installer/util/util_constants.h

@@ -144,7 +144,6 @@ enum InstallerStage {
 
 namespace switches {
 
-extern const char kChrome[];
 extern const char kChromeSxS[];
 extern const char kConfigureUserSettings[];
 extern const char kCriticalUpdateVersion[];
@@ -162,7 +161,6 @@ extern const char kInstallerData[];
 extern const char kLogFile[];
 extern const char kMakeChromeDefault[];
 extern const char kMsi[];
-extern const char kMultiInstall[];
 extern const char kNewSetupExe[];
 extern const char kOnOsUpgrade[];
 extern const char kPreviousVersion[];