Do machine inspection on install....

chrome/installer/setup/install.cc

 // Copyright (c) 2010 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/install.h"
 
 #include <shlobj.h>
 #include <time.h>
 #include <vector>
 
@@ skipping 271 matching lines @@
 //
 // If the shortcuts do not exist, the function does not recreate them during
 // update.
 bool CreateOrUpdateChromeShortcuts(const FilePath& setup_path,
                                    const Version& new_version,
                                    installer::InstallStatus install_status,
                                    const Product& product,
                                    bool create_all_shortcut,
                                    bool alt_shortcut) {
   // TODO(tommi): Change this function to use WorkItemList.
-#ifndef NDEBUG
-  const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
-  DCHECK(prefs.install_chrome());
-#endif
+  DCHECK(product.is_chrome());
 
   FilePath shortcut_path;
   int dir_enum = product.system_level() ?
       base::DIR_COMMON_START_MENU : base::DIR_START_MENU;
   if (!PathService::Get(dir_enum, &shortcut_path)) {
     LOG(ERROR) << "Failed to get location for shortcut.";
     return false;
   }
 
   BrowserDistribution* browser_dist = product.distribution();
@@ skipping 625 matching lines @@
                              const FilePath& setup_path,
                              const Version& new_version,
                              const Product& product,
                              WorkItemList* list) {
   DCHECK(product.is_chrome_frame());
   if (!product.package().multi_install()) {
     VLOG(1) << "Not adding GCF specific work items for single install.";
     return;
   }
 
-  const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
-  bool ready_mode = false;
-  prefs.GetBool(installer::master_preferences::kChromeFrameReadyMode,
-                &ready_mode);
+  // TODO(tommi): This assumes we know exactly how ShouldCreateUninstallEntry
+  // is implemented.  Since there is logic in ChromeFrameDistribution for how
+  // to determine when this is enabled, this is how we have to figure out if
+  // this feature is enabled right now, but it's a hack and we need a cleaner
+  // way to figure this out.
+  // Note that we cannot just check the master preferences for
+  // kChromeFrameReadyMode, since there are other things that need to be correct
+  // in the environment in order to enable this feature.
+  bool ready_mode = !product.distribution()->ShouldCreateUninstallEntry();
+
   HKEY root = product.package().system_level() ? HKEY_LOCAL_MACHINE :
                                                  HKEY_CURRENT_USER;
   bool update_chrome_uninstall_command = false;
   if (ready_mode) {
     // If GCF is being installed in ready mode, we write an entry to the
     // multi-install state key.  If the value already exists, we will not
     // overwrite it since the user might have opted out.
     list->AddCreateRegKeyWorkItem(root,
         product.package().properties()->GetStateKey());
     list->AddSetRegValueWorkItem(root,
@@ skipping 34 matching lines @@
       // check if Chrome is installed, and if so, update its uninstallation
       // command lines.
       update_chrome_uninstall_command = true;
     }
   }
 
   if (update_chrome_uninstall_command) {
     // Chrome is not a part of this installation run, so we have to explicitly
     // check if Chrome is installed, and if so, update its uninstallation
     // command lines.
+    const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
     BrowserDistribution* chrome_dist =
         BrowserDistribution::GetSpecificDistribution(
             BrowserDistribution::CHROME_BROWSER, prefs);
     const Package& pack = product.package();
     scoped_refptr<Package> package(new Package(pack.multi_install(),
         pack.system_level(), pack.path(), pack.properties()));
     scoped_refptr<Product> chrome_product(new Product(chrome_dist, package));
     AddUninstallShortcutWorkItems(setup_path, new_version, list,
                                   *chrome_product.get());
   }
 }
 
 InstallStatus ChromeFrameReadyModeOptIn(const CommandLine& cmd_line) {
   VLOG(1) << "Opting into Chrome Frame";
   InstallStatus status = INSTALL_REPAIRED;
 
   const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
   bool system_install = false;
   prefs.GetBool(master_preferences::kSystemLevel, &system_install);
   BrowserDistribution* cf = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_FRAME, prefs);
+  DCHECK(cf->ShouldCreateUninstallEntry())
+      << "Opting into CF should create an uninstall entry";
   BrowserDistribution* chrome = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BROWSER, prefs);
 
 #if defined(GOOGLE_CHROME_BUILD)
   ChromePackageProperties package_properties;
 #else
   ChromiumPackageProperties package_properties;
 #endif
 
   // Remove ChromeFrameReadyMode, update Chrome's uninstallation commands to
@@ skipping 30 matching lines @@
       LOG(ERROR) << "Failed to opt into GCF";
       item_list->Rollback();
       status = READY_MODE_OPT_IN_FAILED;
     }
   }
 
   return status;
 }
 
 }  // namespace installer