Product cleanups in the wake of multi-install removal.

chrome/installer/setup/installer_state.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/setup/installer_state.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 94 matching lines @@
       root_key_ = NULL;
       break;
   }
 }
 
 // Evaluates a product's eligibility for participation in this operation.
 // We never expect these checks to fail, hence they all terminate the process in
 // debug builds.  See the log messages for details.
 bool InstallerState::CanAddProduct(const base::FilePath* product_dir) const {
   if (product_) {
-    LOG(DFATAL) << "Cannot process more than one single-install product.";
+    LOG(DFATAL) << "Cannot process more than one product.";
     return false;
   }
   return true;
 }
 
 // Adds |product|, installed in |product_dir| to this object's collection.  If
 // |product_dir| is NULL, the product's default install location is used.
 // Returns NULL if |product| is incompatible with this object.  Otherwise,
 // returns a pointer to the product (ownership is held by this object).
 Product* InstallerState::AddProductInDirectory(
     const base::FilePath* product_dir,
     std::unique_ptr<Product> product) {
   DCHECK(product);
   const Product& the_product = *product;
-  DCHECK(!the_product.HasOption(kOptionMultiInstall));
 
   if (!CanAddProduct(product_dir))
     return nullptr;
 
   if (target_path_.empty()) {
     target_path_ = product_dir ? *product_dir : GetChromeInstallPath(
                                                     system_install(),
                                                     the_product.distribution());
   }
 
@@ skipping 10 matching lines @@
 
 // Adds a product constructed on the basis of |prefs|, setting this object's msi
 // flag if the product is represented in |machine_state| and is msi-installed.
 // Returns the product that was added, or NULL if |state| is incompatible with
 // this object.  Ownership is not passed to the caller.
 Product* InstallerState::AddProductFromPreferences(
     const MasterPreferences& prefs,
     const InstallationState& machine_state) {
   std::unique_ptr<Product> product_ptr(
       new Product(BrowserDistribution::GetDistribution()));
-  product_ptr->InitializeFromPreferences(prefs);
 
   Product* product = AddProductInDirectory(nullptr, std::move(product_ptr));
 
   if (product != NULL && !msi_) {
     const ProductState* product_state =
         machine_state.GetProductState(system_install());
     if (product_state != NULL)
       msi_ = product_state->is_msi();
   }
 
   return product;
 }
 
 Product* InstallerState::AddProductFromState(
     const ProductState& state) {
   std::unique_ptr<Product> product_ptr(
       new Product(BrowserDistribution::GetDistribution()));
-  product_ptr->InitializeFromUninstallCommand(state.uninstall_command());
 
   // Strip off <version>/Installer/setup.exe; see GetInstallerDirectory().
   base::FilePath product_dir =
       state.GetSetupPath().DirName().DirName().DirName();
 
   Product* product =
       AddProductInDirectory(&product_dir, std::move(product_ptr));
 
   if (product != NULL)
     msi_ |= state.is_msi();
@@ skipping 133 matching lines @@
 #endif
   }
   install_list->Do();
 }
 
 bool InstallerState::RequiresActiveSetup() const {
   return system_install();
 }
 
 }  // namespace installer