Add support for the quick-enable-cf command to the installer. This encompase...

chrome/installer/setup/chrome_frame_quick_enable.cc

 // Copyright (c) 2011 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/logging.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 24 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.
+  // Chrome Frame must not be installed (ready-mode doesn't count).
   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) {
+  if (cf_state != NULL &&
+      !cf_state->uninstall_command().HasSwitch(
+          switches::kChromeFrameReadyMode)) {
     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 47 matching lines @@
       const Version* opv = chrome_state->old_version();
       AppendPostInstallTasks(*installer_state, setup_path, new_chrome_exe, 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(*installer_state, item_list.get());
 
+      // Add the items to remove the quick-enable-cf command from the registry.
+      AddQuickEnableWorkItems(*installer_state, machine_state,
+                              &chrome_state->uninstall_command().GetProgram(),
+                              &chrome_state->version(),
+                              item_list.get());
+
       if (!item_list->Do()) {
         item_list->Rollback();
         status = INSTALL_FAILED;
       } else {
         DCHECK_EQ(FIRST_INSTALL_SUCCESS, status);
         VLOG(1) << "Chrome Frame successfully activated.";
       }
     }
   }
 
   return status;
 }
 
 }  // namespace installer