Remove Chrome Frame ready-mode.

chrome/installer/setup/setup_util.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.
 //
 // This file declares util functions for setup project.
 
 #include "chrome/installer/setup/setup_util.h"
 
 #include <windows.h>
 
@@ skipping 305 matching lines @@
 bool WillProductBePresentAfterSetup(
     const installer::InstallerState& installer_state,
     const installer::InstallationState& machine_state,
     BrowserDistribution::Type type) {
   DCHECK(SupportsSingleInstall(type) || installer_state.is_multi_install());
 
   const ProductState* product_state =
       machine_state.GetProductState(installer_state.system_install(), type);
 
   // Determine if the product is present prior to the current operation.
-  bool is_present = false;
-  if (product_state != NULL) {
-    if (type == BrowserDistribution::CHROME_FRAME) {
-      is_present = !product_state->uninstall_command().HasSwitch(
-                        switches::kChromeFrameReadyMode);
-    } else {
-      is_present = true;
-    }
-  }
-
+  bool is_present = (product_state != NULL);
   bool is_uninstall = installer_state.operation() == InstallerState::UNINSTALL;
 
   // Determine if current operation affects the product.
-  bool is_affected = false;
   const Product* product = installer_state.FindProduct(type);
-  if (product != NULL) {
-    if (type == BrowserDistribution::CHROME_FRAME) {
-      // If Chrome Frame is being uninstalled, we don't bother to check
-      // !HasOption(kOptionReadyMode) since CF would not have been installed
-      // in the first place. If for some odd reason it weren't, we would be
-      // conservative, and cause false to be retruned since CF should not be
-      // installed then (so is_uninstall = true and is_affected = true).
-      is_affected = is_uninstall || !product->HasOption(kOptionReadyMode);
-    } else {
-      is_affected = true;
-    }
-  }
+  bool is_affected = (product != NULL);
 
   // Decide among {(1),(2),(3),(4)}.
   return is_affected ? !is_uninstall : is_present;
 }
 
 bool AdjustProcessPriority() {
   if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     DWORD priority_class = ::GetPriorityClass(::GetCurrentProcess());
     if (priority_class == 0) {
       PLOG(WARNING) << "Failed to get the process's priority class.";
@@ skipping 121 matching lines @@
 }
 
 ScopedTokenPrivilege::~ScopedTokenPrivilege() {
   if (is_enabled_ && previous_privileges_.PrivilegeCount != 0) {
     ::AdjustTokenPrivileges(token_, FALSE, &previous_privileges_,
                             sizeof(TOKEN_PRIVILEGES), NULL, NULL);
   }
 }
 
 }  // namespace installer