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

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 246 matching lines @@
   flags_exp.insert(google_update::kRegRunAsUserField);
   ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid);
 }
 
 // Validates the "install-application" Google Update product command.
 void InstallationValidator::ValidateInstallAppCommand(
     const ProductContext& ctx,
     const AppCommand& app_cmd,
     bool* is_valid) {
   ValidateInstallCommand(ctx, app_cmd, kCmdInstallApp,
-                         installer::kChromeAppHostExe,
+                         installer::kChromeExe,
                          ::switches::kInstallFromWebstore, is_valid);
 }
 
 // Validates the "install-extension" Google Update product command.
 void InstallationValidator::ValidateInstallExtensionCommand(
     const ProductContext& ctx,
     const AppCommand& app_cmd,
     bool* is_valid) {
   ValidateInstallCommand(ctx, app_cmd, kCmdInstallExtension,
                          installer::kChromeExe,
@@ skipping 97 matching lines @@
   ValidateSetupPath(ctx, cmd_line.GetProgram(), name, is_valid);
 
   SwitchExpectations expected;
 
   expected.push_back(std::make_pair(
       std::string(switches::kChromeAppLauncher), 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, cmd_line, expected, name, is_valid);
 
   std::set<string16> flags_exp;
   flags_exp.insert(google_update::kRegSendsPingsField);
   flags_exp.insert(google_update::kRegWebAccessibleField);
   flags_exp.insert(google_update::kRegRunAsUserField);
   ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid);
 }
 
@@ skipping 129 matching lines @@
   }
 
   // ap must have -applauncher iff Chrome App Launcher 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 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
   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 304 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