Remove Chrome Frame quick-enable.

chrome/installer/util/installation_validator_unittest.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.
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 76 matching lines @@
                            const char* version,
                            int channel_modifiers);
   void AddQueryEULAAcceptanceCommand(BrowserDistribution::Type dist_type,
                                      Level install_level,
                                      const char* version,
                                      int channel_modifiers);
   void AddQuickEnableApplicationHostCommand(BrowserDistribution::Type dist_type,
                                             Level install_level,
                                             const char* version,
                                             int channel_modifiers);
-  void AddQuickEnableCfCommand(BrowserDistribution::Type dist_type,
-                               Level install_level,
-                               const char* version,
-                               int channel_modifiers);
   void set_multi_install(bool is_multi_install) {
     multi_install_ = is_multi_install;
   }
   installer::AppCommands& commands() { return commands_; }
 
  protected:
   struct ChannelMethodForModifier {
     ChannelModifier modifier;
     bool (ChannelInfo::*method)(bool value);
   };
@@ skipping 180 matching lines @@
   cmd_line.AppendSwitch(installer::switches::kMultiInstall);
   cmd_line.AppendSwitch(installer::switches::kChromeAppLauncher);
   cmd_line.AppendSwitch(installer::switches::kEnsureGoogleUpdatePresent);
   AppCommand app_cmd(cmd_line.GetCommandLineString());
   app_cmd.set_sends_pings(true);
   app_cmd.set_is_web_accessible(true);
   app_cmd.set_is_run_as_user(true);
   commands_.Set(installer::kCmdQuickEnableApplicationHost, app_cmd);
 }
 
-// Adds the "quick-enable-cf" Google Update product command.
-void FakeProductState::AddQuickEnableCfCommand(
-    BrowserDistribution::Type dist_type,
-    Level install_level,
-    const char* version,
-    int channel_modifiers) {
-  DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES);
-  DCHECK_NE(channel_modifiers & CM_MULTI, 0);
-
-  CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version,
-                                       channel_modifiers));
-  cmd_line.AppendSwitch(installer::switches::kMultiInstall);
-  if (install_level == SYSTEM_LEVEL)
-    cmd_line.AppendSwitch(installer::switches::kSystemLevel);
-  cmd_line.AppendSwitch(installer::switches::kChromeFrameQuickEnable);
-  AppCommand app_cmd(cmd_line.GetCommandLineString());
-  app_cmd.set_sends_pings(true);
-  app_cmd.set_is_web_accessible(true);
-  commands_.Set(installer::kCmdQuickEnableCf, app_cmd);
-}
-
 }  // namespace
 
 // Fixture for testing the InstallationValidator.  Errors logged by the
 // validator are sent to an optional mock recipient (see
 // set_validation_error_recipient) upon which expectations can be placed.
 class InstallationValidatorTest
     : public testing::TestWithParam<InstallationValidator::InstallationType> {
  public:
 
   // These shouldn't need to be public, but there seems to be some interaction
@@ skipping 162 matching lines @@
   const int channel_modifiers =
       is_multi_install ? GetChannelModifiers(inst_type) : 0;
 
   state->Clear();
   state->SetChannel(channels[channel], channel_modifiers);
   state->SetVersion(chrome::kChromeVersion);
   state->SetUninstallCommand(prod_type, install_level, chrome::kChromeVersion,
                              channel_modifiers, vehicle);
   state->set_multi_install(is_multi_install);
   if (prod_type == BrowserDistribution::CHROME_BINARIES) {
-    if (inst_type == InstallationValidator::CHROME_MULTI) {
-      state->AddQuickEnableCfCommand(prod_type, install_level,
-                                     chrome::kChromeVersion, channel_modifiers);
-    }
     state->AddQueryEULAAcceptanceCommand(prod_type,
                                          install_level,
                                          chrome::kChromeVersion,
                                          channel_modifiers);
   }
   if (prod_type == BrowserDistribution::CHROME_BINARIES) {
     state->AddQuickEnableApplicationHostCommand(prod_type,
                                                 install_level,
                                                 chrome::kChromeVersion,
                                                 channel_modifiers);
@@ skipping 79 matching lines @@
     AllValidInstallations,
     InstallationValidatorTest,
     Values(InstallationValidator::NO_PRODUCTS,
            InstallationValidator::CHROME_SINGLE,
            InstallationValidator::CHROME_MULTI,
            InstallationValidator::CHROME_FRAME_SINGLE,
            InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE,
            InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI,
            InstallationValidator::CHROME_FRAME_MULTI,
            InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI));