Remove Chrome Frame quick-enable.

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 296 matching lines @@
                                     ctx.system_install));
 
   ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid);
 
   std::set<string16> flags_exp;
   flags_exp.insert(google_update::kRegWebAccessibleField);
   flags_exp.insert(google_update::kRegRunAsUserField);
   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,
     const AppCommand& app_cmd,
     bool* is_valid) {
   DCHECK(is_valid);
 
   CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
   string16 name(kCmdQuickEnableApplicationHost);
 
@@ skipping 58 matching lines @@
                << scan->first << "\".";
   }
 }
 
 // Validates the multi-install binaries' Google Update commands.
 void InstallationValidator::ValidateBinariesCommands(
     const ProductContext& ctx,
     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;
 
     expectations[kCmdQueryEULAAcceptance] = &ValidateQueryEULAAcceptanceCommand;
   }
 
   ValidateAppCommandExpectations(ctx, expectations, is_valid);
 }
 
 // Validates the multi-install binaries at level |system_level|.
@@ skipping 401 matching lines @@
                                                      InstallationType* type) {
   DCHECK(type);
   InstallationState machine_state;
 
   machine_state.Initialize();
 
   return ValidateInstallationTypeForState(machine_state, system_level, type);
 }
 
 }  // namespace installer