Merge 241116 "Remove Chrome Frame quick-enable."

chrome/installer/util/installation_validator.cc

Index: chrome/installer/util/installation_validator.cc
===================================================================
--- chrome/installer/util/installation_validator.cc	(revision 243908)
+++ chrome/installer/util/installation_validator.cc	(working copy)
@@ -314,35 +314,6 @@
   ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid);
 }
 
-// Validates the "quick-enable-cf" Google Update product command.
-void InstallationValidator::ValidateQuickEnableCfCommand(
-    const ProductContext& ctx,
-    const AppCommand& app_cmd,
-    bool* is_valid) {
-  DCHECK(is_valid);
-
-  CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
-  string16 name(kCmdQuickEnableCf);
-
-  ValidateSetupPath(ctx, cmd_line.GetProgram(), name, is_valid);
-
-  SwitchExpectations expected;
-
-  expected.push_back(
-      std::make_pair(std::string(switches::kChromeFrameQuickEnable), true));
-  expected.push_back(std::make_pair(std::string(switches::kSystemLevel),
-                                    ctx.system_install));
-  expected.push_back(std::make_pair(std::string(switches::kMultiInstall),
-                                    ctx.state.is_multi_install()));
-
-  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);
-  ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid);
-}
-
 // Validates the "quick-enable-application-host" Google Update product command.
 void InstallationValidator::ValidateQuickEnableApplicationHostCommand(
     const ProductContext& ctx,
@@ -421,20 +392,12 @@
     bool* is_valid) {
   DCHECK(is_valid);
 
-  // The quick-enable-cf command must be present if Chrome Binaries are
-  // installed and Chrome Frame is not installed.
-  const ChannelInfo& channel = ctx.state.channel();
   const ProductState* binaries_state = ctx.machine_state.GetProductState(
       ctx.system_install, BrowserDistribution::CHROME_BINARIES);
-  const ProductState* cf_state = ctx.machine_state.GetProductState(
-      ctx.system_install, BrowserDistribution::CHROME_FRAME);
 
   CommandExpectations expectations;
 
   if (binaries_state != NULL) {
-    if (cf_state == NULL)
-      expectations[kCmdQuickEnableCf] = &ValidateQuickEnableCfCommand;
-
     expectations[kCmdQuickEnableApplicationHost] =
         &ValidateQuickEnableApplicationHostCommand;