Removing deprecated DCHECK's that require App Launcher to be user-level only.

chrome/installer/util/installation_validator.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.
 
 // Implementation of the installation validator.
 
 #include "chrome/installer/util/installation_validator.h"
 
 #include <algorithm>
 #include <set>
@@ skipping 97 matching lines @@
 }
 
 BrowserDistribution::Type
     InstallationValidator::ChromeAppHostRules::distribution_type() const {
   return BrowserDistribution::CHROME_APP_HOST;
 }
 
 void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations(
     const ProductContext& ctx,
     SwitchExpectations* expectations) const {
-  DCHECK(!ctx.system_install);
-
   // --app-launcher must be present.
   expectations->push_back(
       std::make_pair(std::string(switches::kChromeAppLauncher), true));
 
   // --chrome must not be present.
   expectations->push_back(std::make_pair(std::string(switches::kChrome),
                                          false));
   // --chrome-frame must not be present.
   expectations->push_back(std::make_pair(std::string(switches::kChromeFrame),
                                          false));
@@ skipping 730 matching lines @@
 
   // Is Chrome App Host installed?
   product_state =
       machine_state.GetProductState(system_level,
                                     BrowserDistribution::CHROME_APP_HOST);
   if (product_state != NULL) {
     ChromeAppHostRules chrome_app_host_rules;
     ValidateProduct(machine_state, system_level, *product_state,
                     chrome_app_host_rules, &rock_on);
     *type = static_cast<InstallationType>(*type | ProductBits::CHROME_APP_HOST);
-    if (system_level) {
-      LOG(ERROR) <<
-          "Chrome App Launcher must not be installed at system level.";
-      rock_on = false;
-    }
     if (!product_state->is_multi_install()) {
       LOG(ERROR) << "Chrome App Launcher must always be multi-install.";
       rock_on = false;
     }
   }
 
   DCHECK_NE(std::find(&kInstallationTypes[0],
                       &kInstallationTypes[arraysize(kInstallationTypes)],
                       *type),
             &kInstallationTypes[arraysize(kInstallationTypes)])
       << "Invalid combination of products found on system (" << *type << ")";
 
   return rock_on;
 }
 
 // static
 bool InstallationValidator::ValidateInstallationType(bool system_level,
                                                      InstallationType* type) {
   DCHECK(type);
   InstallationState machine_state;
 
   machine_state.Initialize();
 
   return ValidateInstallationTypeForState(machine_state, system_level, type);
 }
 
 }  // namespace installer