Remove kCmdInstallExtension and kCmdInstallApp from Installer code

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 183 matching lines @@
     bool expected = flags_exp.find(check_list[i].exp_key) != flags_exp.end();
     if (check_list[i].val != expected) {
       *is_valid = false;
       LOG(ERROR) << ctx.dist->GetDisplayName() << ": "
                  << name << " command should " << (expected ? "" : "not ")
                  << check_list[i].msg << ".";
     }
   }
 }
 
-// Validates both "install-application" and "install-extension" depending on
-// what is passed in.
-void InstallationValidator::ValidateInstallCommand(

[Devlin, 2014/09/30 18:03:01]

My understanding is that, since these should never be attached as commands
anymore, there's no reason to validate them.  Right?

[grt (UTC plus 2), 2014/09/30 18:30:33]

Could you make it validate that the commands aren't present?

[Devlin, 2014/09/30 18:51:02]

I *think* (still very new to this code, so could be very wrong) that they will
be implicitly checked via ValidateAppCommandExpectations(), which, on lines 313
- 316 of the new version (originally lines 371 - 374) will throw an error and
fail validation if an unexpected command is found. Since we remove our
expectations for these commands in ValidateAppCommands(), this will do the
trick, right?

[grt (UTC plus 2), 2014/09/30 18:59:26]

i think you're right, thanks.

-    const ProductContext& ctx,
-    const AppCommand& app_cmd,
-    const wchar_t* expected_command,
-    const wchar_t* expected_app_name,
-    const char* expected_switch,
-    bool* is_valid) {
-  DCHECK(is_valid);
-
-  CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
-  base::string16 name(expected_command);
-
-  base::FilePath expected_path(
-      installer::GetChromeInstallPath(ctx.system_install, ctx.dist)
-      .Append(expected_app_name));
-
-  if (!base::FilePath::CompareEqualIgnoreCase(expected_path.value(),
-                                              cmd_line.GetProgram().value())) {
-    *is_valid = false;
-    LOG(ERROR) << name << "'s path is not "
-               << expected_path.value() << ": "
-               << cmd_line.GetProgram().value();
-  }
-
-  SwitchExpectations expected;
-  expected.push_back(std::make_pair(std::string(expected_switch), true));
-
-  ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid);
-
-  std::set<base::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);
-}
-
-// 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,
-                         ::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,
-                         ::switches::kLimitedInstallFromWebstore, is_valid);
-}
-
 // Validates the "on-os-upgrade" Google Update internal command.
 void InstallationValidator::ValidateOnOsUpgradeCommand(
     const ProductContext& ctx,
     const AppCommand& app_cmd,
     bool* is_valid) {
   DCHECK(is_valid);
 
   CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
   base::string16 name(kCmdOnOsUpgrade);
 
@@ skipping 407 matching lines @@
 }
 
 // Validates the Google Update commands for the product described in |ctx|.
 void InstallationValidator::ValidateAppCommands(
     const ProductContext& ctx,
     bool* is_valid) {
   DCHECK(is_valid);
 
   CommandExpectations expectations;
 
-  if (ctx.dist->GetType() == BrowserDistribution::CHROME_APP_HOST) {
-    expectations[kCmdInstallApp] = &ValidateInstallAppCommand;
-  }
-  if (ctx.dist->GetType() == BrowserDistribution::CHROME_BROWSER) {
-    expectations[kCmdInstallExtension] = &ValidateInstallExtensionCommand;
+  if (ctx.dist->GetType() == BrowserDistribution::CHROME_BROWSER)
     expectations[kCmdOnOsUpgrade] = &ValidateOnOsUpgradeCommand;
-  }
 
   ValidateAppCommandExpectations(ctx, expectations, is_valid);
 }
 
 // Validates usagestats for the product or binaries in |ctx|.
 void InstallationValidator::ValidateUsageStats(const ProductContext& ctx,
                                                bool* is_valid) {
   DWORD usagestats = 0;
   if (ctx.state.GetUsageStats(&usagestats)) {
     if (!ctx.rules.UsageStatsAllowed(ctx)) {
@@ skipping 109 matching lines @@
                                                      InstallationType* type) {
   DCHECK(type);
   InstallationState machine_state;
 
   machine_state.Initialize();
 
   return ValidateInstallationTypeForState(machine_state, system_level, type);
 }
 
 }  // namespace installer