Implementing unified Chrome / App Launcher flow, and migrating old stand-alone App Launcher.

chrome/installer/util/installation_validator.cc

Index: chrome/installer/util/installation_validator.cc
diff --git a/chrome/installer/util/installation_validator.cc b/chrome/installer/util/installation_validator.cc
index 2875beb4045b5f1f0bf90bb4d1b9a339bcd0f9df..e09e7cdad661f3778ef6a8b6217e7e28ea1661d2 100644
--- a/chrome/installer/util/installation_validator.cc
+++ b/chrome/installer/util/installation_validator.cc
@@ -264,7 +264,7 @@ void InstallationValidator::ValidateInstallAppCommand(
     const AppCommand& app_cmd,
     bool* is_valid) {
   ValidateInstallCommand(ctx, app_cmd, kCmdInstallApp,
-                         installer::kChromeAppHostExe,
+                         installer::kChromeExe,
                          ::switches::kInstallFromWebstore, is_valid);
 }
 
@@ -382,8 +382,6 @@ void InstallationValidator::ValidateQuickEnableApplicationHostCommand(
       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, cmd_line, expected, name, is_valid);
 
@@ -533,16 +531,11 @@ void InstallationValidator::ValidateBinaries(
       *is_valid = false;
       LOG(ERROR) << "Chrome App Launcher is installed in non-multi mode.";
     }
-    if (!channel.IsAppLauncher()) {
-      *is_valid = false;
-      LOG(ERROR) << "Chrome Binaries are missing \"-applauncher\" in channel"
-                    " name: \"" << channel.value() << "\"";
-    }
-  } else if (channel.IsAppLauncher()) {
+  }
+  if (channel.IsAppLauncher()) {
     *is_valid = false;
-    LOG(ERROR) << "Chrome Binaries have \"-applauncher\" in channel name, yet "
-                  "Chrome App Launcher is not installed: \"" << channel.value()
-               << "\"";
+    LOG(ERROR) << "Chrome Binaries have deprecated \"-applauncher\" in channel "
+                  "name: \"" << channel.value() << "\"";
   }
 
   // Chrome, Chrome Frame, or App Host must be present
@@ -867,11 +860,6 @@ bool InstallationValidator::ValidateInstallationTypeForState(
     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;