Remove Chrome Frame ready-mode.

chrome/installer/setup/chrome_frame_quick_enable.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/chrome_frame_quick_enable.h"
 
 #include <windows.h>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
       machine_state.GetProductState(installer_state.system_install(),
                                     BrowserDistribution::CHROME_BROWSER);
   if (chrome_state == NULL) {
     LOG(ERROR) << "Chrome Frame quick enable requires Chrome to be installed.";
     return CHROME_NOT_INSTALLED;
   } else if (!chrome_state->is_multi_install()) {
     LOG(ERROR) << "Chrome Frame quick enable requires multi-install of Chrome.";
     return NON_MULTI_INSTALLATION_EXISTS;
   }
 
-  // Chrome Frame must not be installed (ready-mode doesn't count).
+  // Chrome Frame must not be installed.
   const ProductState* cf_state =
       machine_state.GetProductState(installer_state.system_install(),
                                     BrowserDistribution::CHROME_FRAME);
   // Make sure we check both user and system installations.
   if (!cf_state) {
     cf_state = machine_state.GetProductState(!installer_state.system_install(),
                                              BrowserDistribution::CHROME_FRAME);
   }
 
-  if (cf_state != NULL &&
-      !cf_state->uninstall_command().HasSwitch(
-          switches::kChromeFrameReadyMode)) {
+  if (cf_state != NULL) {
     LOG(ERROR) << "Chrome Frame already installed.";
     return installer_state.system_install() ?
         SYSTEM_LEVEL_INSTALL_EXISTS : USER_LEVEL_INSTALL_EXISTS;
   }
 
   return FIRST_INSTALL_SUCCESS;
 }
 
 }  // end namespace
 
@@ skipping 34 matching lines @@
       base::FilePath setup_path(chrome_state->GetSetupPath());
       const Version& new_version = chrome_state->version();
 
       // This creates the uninstallation entry for GCF.
       AddUninstallShortcutWorkItems(*installer_state, setup_path, new_version,
                                     *cf, item_list.get());
       // Always set the "lang" value since quick-enable always happens in the
       // context of an interactive session with a user.
       AddVersionKeyWorkItems(installer_state->root_key(), cf->distribution(),
                              new_version, true, item_list.get());
-      AddChromeFrameWorkItems(machine_state, *installer_state, setup_path,
-                              new_version, *cf, item_list.get());
 
       const Version* opv = chrome_state->old_version();
       AppendPostInstallTasks(*installer_state, setup_path, opv,
                              new_version, temp_path.path(), item_list.get());
 
       // Before updating the channel values, add Chrome back to the mix so that
       // all multi-installed products' channel values get updated.
       installer_state->AddProductFromState(BrowserDistribution::CHROME_BROWSER,
                                            *chrome_state);
       AddGoogleUpdateWorkItems(machine_state, *installer_state,
@@ skipping 39 matching lines @@
                 BrowserDistribution::CHROME_BINARIES),
             true)) {
       LOG(ERROR) << "Failed to set EULA consent for multi-install binaries.";
     }
   }
 
   return status;
 }
 
 }  // namespace installer