Remove Chrome Frame ready-mode.

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 17 matching lines @@
 
 void InstallationValidator::ChromeRules::AddUninstallSwitchExpectations(
     const ProductContext& ctx,
     SwitchExpectations* expectations) const {
   const bool is_multi_install =
       ctx.state.uninstall_command().HasSwitch(switches::kMultiInstall);
 
   // --chrome should be present for uninstall iff --multi-install.  This wasn't
   // the case in Chrome 10 (between r68996 and r72497), though, so consider it
   // optional.
-
-  // --chrome-frame --ready-mode should be present for uninstall iff CF in ready
-  // mode.
-  const ProductState* cf_state =
-      ctx.machine_state.GetProductState(ctx.system_install,
-                                        BrowserDistribution::CHROME_FRAME);
-  const bool ready_mode =
-      cf_state != NULL &&
-      cf_state->uninstall_command().HasSwitch(switches::kChromeFrameReadyMode);
-  expectations->push_back(std::make_pair(std::string(switches::kChromeFrame),
-                                         ready_mode));
-  expectations->push_back(
-      std::make_pair(std::string(switches::kChromeFrameReadyMode), ready_mode));
 }
 
 void InstallationValidator::ChromeRules::AddRenameSwitchExpectations(
     const ProductContext& ctx,
     SwitchExpectations* expectations) const {
   const bool is_multi_install =
       ctx.state.uninstall_command().HasSwitch(switches::kMultiInstall);
 
   // --chrome should not be present for rename.  It was for a time, so we'll be
   // lenient so that mini_installer tests pass.
 
-  // --chrome-frame --ready-mode should never be present.
+  // --chrome-frame should never be present.
   expectations->push_back(
       std::make_pair(std::string(switches::kChromeFrame), false));
-  expectations->push_back(
-      std::make_pair(std::string(switches::kChromeFrameReadyMode), false));
 }
 
 bool InstallationValidator::ChromeRules::UsageStatsAllowed(
     const ProductContext& ctx) const {
   // Products must not have usagestats consent values when multi-install
   // (only the multi-install binaries may).
   return !ctx.state.is_multi_install();
 }
 
 BrowserDistribution::Type
@@ skipping 89 matching lines @@
 const InstallationValidator::InstallationType
     InstallationValidator::kInstallationTypes[] = {
   NO_PRODUCTS,
   CHROME_SINGLE,
   CHROME_MULTI,
   CHROME_FRAME_SINGLE,
   CHROME_FRAME_SINGLE_CHROME_SINGLE,
   CHROME_FRAME_SINGLE_CHROME_MULTI,
   CHROME_FRAME_MULTI,
   CHROME_FRAME_MULTI_CHROME_MULTI,
-  CHROME_FRAME_READY_MODE_CHROME_MULTI,
   CHROME_APP_HOST,
   CHROME_APP_HOST_CHROME_FRAME_SINGLE,
   CHROME_APP_HOST_CHROME_FRAME_SINGLE_CHROME_MULTI,
   CHROME_APP_HOST_CHROME_FRAME_MULTI,
   CHROME_APP_HOST_CHROME_FRAME_MULTI_CHROME_MULTI,
   CHROME_APP_HOST_CHROME_MULTI,
-  CHROME_APP_HOST_CHROME_MULTI_CHROME_FRAME_READY_MODE,
 };
 
 void InstallationValidator::ValidateAppCommandFlags(
     const ProductContext& ctx,
     const AppCommand& app_cmd,
     const std::set<string16>& flags_exp,
     const string16& name,
     bool* is_valid) {
   const struct {
     const string16 exp_key;
@@ skipping 238 matching lines @@
   }
 }
 
 // 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 (or installed in ready mode).
+  // 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 || channel.IsReadyMode())
+    if (cf_state == NULL)
       expectations[kCmdQuickEnableCf] = &ValidateQuickEnableCfCommand;
 
     expectations[kCmdQuickEnableApplicationHost] =
         &ValidateQuickEnableApplicationHostCommand;
 
     expectations[kCmdQueryEULAAcceptance] = &ValidateQueryEULAAcceptanceCommand;
   }
 
   ValidateAppCommandExpectations(ctx, expectations, is_valid);
 }
@@ skipping 37 matching lines @@
       LOG(ERROR) << "Chrome Binaries are missing \"-chromeframe\" in channel"
                     " name: \"" << channel.value() << "\"";
     }
   } else if (channel.IsChromeFrame()) {
     *is_valid = false;
     LOG(ERROR) << "Chrome Binaries have \"-chromeframe\" in channel name, yet "
                   "Chrome Frame is not installed multi: \"" << channel.value()
                << "\"";
   }
 
-  // ap must have -readymode iff Chrome Frame is installed in ready-mode
-  if (cf_state != NULL &&
-      cf_state->uninstall_command().HasSwitch(
-          installer::switches::kChromeFrameReadyMode)) {
-    if (!channel.IsReadyMode()) {
-      *is_valid = false;
-      LOG(ERROR) << "Chrome Binaries are missing \"-readymode\" in channel"
-                    " name: \"" << channel.value() << "\"";
-    }
-  } else if (channel.IsReadyMode()) {
-    *is_valid = false;
-    LOG(ERROR) << "Chrome Binaries have \"-readymode\" in channel name, yet "
-                  "Chrome Frame is not in ready mode: \"" << channel.value()
-               << "\"";
-  }
-
   // 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;
@@ skipping 306 matching lines @@
   // Is Chrome Frame installed?
   product_state =
       machine_state.GetProductState(system_level,
                                     BrowserDistribution::CHROME_FRAME);
   if (product_state != NULL) {
     ChromeFrameRules chrome_frame_rules;
     ValidateProduct(machine_state, system_level, *product_state,
                     chrome_frame_rules, &rock_on);
     int cf_bit = !product_state->is_multi_install() ?
         ProductBits::CHROME_FRAME_SINGLE :
-        (product_state->uninstall_command().HasSwitch(
-             switches::kChromeFrameReadyMode) ?
-                 ProductBits::CHROME_FRAME_READY_MODE :
-                 ProductBits::CHROME_FRAME_MULTI);
+        ProductBits::CHROME_FRAME_MULTI;
     *type = static_cast<InstallationType>(*type | cf_bit);
   }
 
   // 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,
@@ skipping 19 matching lines @@
                                                      InstallationType* type) {
   DCHECK(type);
   InstallationState machine_state;
 
   machine_state.Initialize();
 
   return ValidateInstallationTypeForState(machine_state, system_level, type);
 }
 
 }  // namespace installer