Remove Chrome Frame ready-mode.

chrome/installer/setup/setup_main.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 "chrome/installer/setup/setup_main.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 20 matching lines @@
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/setup/archive_patch_helper.h"
 #include "chrome/installer/setup/cf_migration.h"
 #include "chrome/installer/setup/chrome_frame_quick_enable.h"
-#include "chrome/installer/setup/chrome_frame_ready_mode.h"
 #include "chrome/installer/setup/install.h"
 #include "chrome/installer/setup/install_worker.h"
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/setup/setup_util.h"
 #include "chrome/installer/setup/uninstall.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 #include "chrome/installer/util/delete_tree_work_item.h"
 #include "chrome/installer/util/eula_util.h"
@@ skipping 309 matching lines @@
     *status = installer::INCONSISTENT_UPDATE_POLICY;
     installer_state.WriteInstallerResult(
         *status, IDS_INSTALL_INCONSISTENT_UPDATE_POLICY_BASE, NULL);
   }
 
   return settings_are_valid;
 #endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
 // If only the binaries are being updated, fail.
-// If Chrome Frame is being installed by itself in multi-mode, non-ready-mode:
+// If Chrome Frame is being installed by itself in multi-mode:
 //   - If a non-multi Chrome Frame installation is present, fail.
-// If Chrome Frame is being installed by itself in multi-mode, ready-mode:
-//   - If no Chrome installation is present, fail.
-//   - If a Chrome installation is present, add it to the set of products to
-//     install.
-// If Chrome Frame is being installed with Chrome in multi-mode, ready-mode:
-//   - If a non-multi Chrome Frame installation is present, Chrome Frame is
-//     removed from |installer_state|'s list of products (thereby preserving
-//     the existing SxS install).
-//   - If a multi Chrome Frame installation is present, its options are
-//     preserved (i.e., the --ready-mode command-line option is ignored).
 // If any product is being installed in single-mode that already exists in
 // multi-mode, fail.
 bool CheckMultiInstallConditions(const InstallationState& original_state,
                                  InstallerState* installer_state,
                                  installer::InstallStatus* status) {
   const Products& products = installer_state->products();
   DCHECK(products.size());
 
   const bool system_level = installer_state->system_install();
 
@@ skipping 55 matching lines @@
           binaries_to_add->SetOption(installer::kOptionMultiInstall, true);
           binaries = installer_state->AddProduct(&binaries_to_add);
           VLOG(1) <<
               "Adding binaries for pre-existing App Launcher installation.";
         }
       }
 
       return true;
     }
 
-    if (chrome) {
-      if (chrome_frame &&
-          chrome_frame->HasOption(installer::kOptionReadyMode)) {
-        // We're being asked to install Chrome with Chrome Frame in ready-mode.
-        // This is an optimistic operation: if a SxS install of Chrome Frame
-        // is already present, don't touch it; if a multi-install of Chrome
-        // Frame is present, preserve its settings (ready-mode).
-        if (cf_state) {
-          installer_state->RemoveProduct(chrome_frame);
-          chrome_frame = NULL;
-          if (cf_state->is_multi_install()) {
-            chrome_frame = installer_state->AddProductFromState(
-                BrowserDistribution::CHROME_FRAME, *cf_state);
-            VLOG(1) << "Upgrading existing multi-install Chrome Frame rather "
-                       "than installing in ready-mode.";
-          } else {
-            VLOG(1) << "Skipping upgrade of single-install Chrome Frame rather "
-                       "than installing in ready-mode.";
-          }
-        } else {
-          VLOG(1) << "Performing initial install of Chrome Frame ready-mode.";
-        }
-      }
-    } else if (chrome_state) {
+    if (!chrome && chrome_state) {
       // A product other than Chrome is being installed in multi-install mode,
       // and Chrome is already present. Add Chrome to the set of products
       // (making it multi-install in the process) so that it is updated, too.
       scoped_ptr<Product> multi_chrome(new Product(
           BrowserDistribution::GetSpecificDistribution(
               BrowserDistribution::CHROME_BROWSER)));
       multi_chrome->SetOption(installer::kOptionMultiInstall, true);
       chrome = installer_state->AddProduct(&multi_chrome);
       VLOG(1) << "Upgrading existing Chrome browser in multi-install mode.";
-    } else if (chrome_frame &&
-               chrome_frame->HasOption(installer::kOptionReadyMode)) {
-      // Chrome Frame with ready-mode is to be installed, yet Chrome is
-      // neither installed nor being installed.  Fail.
-      LOG(ERROR) << "Cannot install Chrome Frame in ready mode without Chrome.";
-      *status = installer::READY_MODE_REQUIRES_CHROME;
-      installer_state->WriteInstallerResult(
-          *status, IDS_INSTALL_READY_MODE_REQUIRES_CHROME_BASE, NULL);
-      return false;
     }
 
     // Fail if we're installing Chrome Frame when a single-install of it is
     // already installed.
     if (chrome_frame && cf_state && !cf_state->is_multi_install()) {
       LOG(ERROR) << "Cannot migrate existing Chrome Frame installation to "
                  << "multi-install.";
       *status = installer::NON_MULTI_INSTALLATION_EXISTS;
       installer_state->WriteInstallerResult(*status,
           IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS_BASE, NULL);
@@ skipping 738 matching lines @@
       InstallUtil::GetChromeVersion(browser_dist, true, &installed_version);
       if (!installed_version.IsValid()) {
         LOG(ERROR) << "No installation of "
                    << browser_dist->GetDisplayName()
                    << " found for system-level toast.";
       } else {
         product.LaunchUserExperiment(
             cmd_line.GetProgram(), installer::REENTRY_SYS_UPDATE, true);
       }
     }
-  } else if (cmd_line.HasSwitch(
-                 installer::switches::kChromeFrameReadyModeOptIn)) {
-    *exit_code = InstallUtil::GetInstallReturnCode(
-        installer::ChromeFrameReadyModeOptIn(original_state, *installer_state));
-  } else if (cmd_line.HasSwitch(
-                 installer::switches::kChromeFrameReadyModeTempOptOut)) {
-    *exit_code = InstallUtil::GetInstallReturnCode(
-        installer::ChromeFrameReadyModeTempOptOut(original_state,
-                                                  *installer_state));
-  } else if (cmd_line.HasSwitch(
-                 installer::switches::kChromeFrameReadyModeEndTempOptOut)) {
-    *exit_code = InstallUtil::GetInstallReturnCode(
-        installer::ChromeFrameReadyModeEndTempOptOut(original_state,
-                                                     *installer_state));
   } else if (cmd_line.HasSwitch(installer::switches::kChromeFrameQuickEnable)) {
     *exit_code = installer::ChromeFrameQuickEnable(original_state,
                                                    installer_state);
   } else if (cmd_line.HasSwitch(installer::switches::kPatch)) {
     const std::string patch_type_str(
         cmd_line.GetSwitchValueASCII(installer::switches::kPatch));
     const base::FilePath input_file(
         cmd_line.GetSwitchValuePath(installer::switches::kInputFile));
     const base::FilePath patch_file(
         cmd_line.GetSwitchValuePath(installer::switches::kPatchFile));
@@ skipping 665 matching lines @@
     // Call the newly updated setup.exe with kUncompressedArchive and
     // kMigrateChromeFrame to perform the migration.
     LaunchChromeFrameMigrationProcess(*chrome_frame_state, cmd_line,
                                       installer_directory, system_install);
   }
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }