Ensuring Google Update at user-level is installed alongside App Host, for the quick-enable App Host…

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 107 matching lines @@
   return BrowserDistribution::CHROME_APP_HOST;
 }
 
 void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations(
     const InstallationState& machine_state,
     bool system_install,
     const ProductState& product_state,
     SwitchExpectations* expectations) const {
   DCHECK(!system_install);
 
-  // --chrome-app-host must be present.
+  // --app-host must be present.
   expectations->push_back(std::make_pair(std::string(switches::kChromeAppHost),
                                          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 186 matching lines @@
 
   CommandLine the_command(CommandLine::FromString(command.command_line()));
 
   ValidateSetupPath(ctx,
                     the_command.GetProgram(),
                     "quick enable application host",
                     is_valid);
 
   SwitchExpectations expected;
 
-  expected.push_back(
-      std::make_pair(std::string(switches::kChromeAppHost), true));
-  expected.push_back(std::make_pair(std::string(switches::kSystemLevel),
-                                    false));
-  expected.push_back(std::make_pair(std::string(switches::kMultiInstall),
-                                    true));
+  expected.push_back(std::make_pair(
+      std::string(switches::kChromeAppHost), true));
+  expected.push_back(std::make_pair(
+      std::string(switches::kSystemLevel), false));
+  expected.push_back(std::make_pair(
+      std::string(switches::kMultiInstall), true));
+  expected.push_back(std::make_pair(
+      std::string(switches::kEnsureGoogleUpdatePresent), true));
 
   ValidateCommandExpectations(ctx,
                               the_command,
                               expected,
                               "quick enable application host",
                               is_valid);
 
   if (!command.sends_pings()) {
     *is_valid = false;
     LOG(ERROR) << "Quick-enable-application-host command is not configured to "
@@ skipping 505 matching lines @@
                                                      InstallationType* type) {
   DCHECK(type);
   InstallationState machine_state;
 
   machine_state.Initialize();
 
   return ValidateInstallationTypeForState(machine_state, system_level, type);
 }
 
 }  // namespace installer