1 files changed, 2 insertions, 23 deletions

diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index da46e4f..b7422a2 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -323,33 +323,12 @@ bool WillProductBePresentAfterSetup(
       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;