Implementing --app-launcher install/uninstall flow.

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-host must be present.
-  expectations->push_back(std::make_pair(std::string(switches::kChromeAppHost),
-                                         true));
+  // Either --app-launcher or --app-host must be present.
+  if (ctx.state.channel().IsAppLauncher()) {
+    expectations->push_back(
+        std::make_pair(std::string(switches::kChromeAppLauncher), true));
+  } else {
+    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));
 }
 
 void InstallationValidator::ChromeAppHostRules::AddRenameSwitchExpectations(
     const ProductContext& ctx,
     SwitchExpectations* expectations) const {
   // TODO(erikwright): I guess there will be none?
 }
@@ skipping 338 matching lines @@
   }
 
   // ap must have -apphost iff Chrome Frame is installed multi
   const ProductState* app_host_state = machine_state.GetProductState(
       system_install, BrowserDistribution::CHROME_APP_HOST);
   if (app_host_state != NULL) {
     if (!app_host_state->is_multi_install()) {
       *is_valid = false;
       LOG(ERROR) << "Chrome App Host is installed in non-multi mode.";
     }
-    if (!channel.IsAppHost()) {
+    if (!channel.IsAppHost() && !channel.IsAppLauncher()) {
       *is_valid = false;
-      LOG(ERROR) << "Chrome Binaries are missing \"-apphost\" in channel"
-                    " name: \"" << channel.value() << "\"";
+      LOG(ERROR) << "Chrome Binaries are missing \"-apphost\" and"
+                    " \"-applauncher\" in channel name: \""
+                 << channel.value() << "\"";
     }
   } else if (channel.IsAppHost()) {
     *is_valid = false;
     LOG(ERROR) << "Chrome Binaries have \"-apphost\" in channel name, yet "
                   "Chrome App Host is not installed: \"" << channel.value()
                << "\"";
+  } else if (channel.IsAppLauncher()) {
+    *is_valid = false;
+    LOG(ERROR) << "Chrome Binaries have \"-applauncher\" in channel name, yet "
+                  "Chrome App Launcher is not installed: \"" << channel.value()
+               << "\"";
   }
 
   // Chrome, Chrome Frame, or App Host must be present
   if (chrome_state == NULL && cf_state == NULL && app_host_state == NULL) {
     *is_valid = false;
     LOG(ERROR) << "Chrome Binaries are present with no other products.";
   }
 
   // Chrome must be multi-install if present.
   if (chrome_state != NULL && !chrome_state->is_multi_install()) {
@@ skipping 332 matching lines @@
                                                      InstallationType* type) {
   DCHECK(type);
   InstallationState machine_state;
 
   machine_state.Initialize();
 
   return ValidateInstallationTypeForState(machine_state, system_level, type);
 }
 
 }  // namespace installer