Duplicate setup.exe into an identical executable and point Active Setup to that executable instead.

chrome/installer/setup/install_worker.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 contains the definitions of the installer functions that build
 // the WorkItemList used to install the application.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <oaidl.h>
@@ skipping 90 matching lines @@
     int len = StringFromGUID2(__uuidof(ChromeFrame), &cf_clsid[0],
                               arraysize(cf_clsid));
     key_path->append(&cf_clsid[0], len - 1);
 #endif
   } else {
     key_path->append(kIELowRightsPolicyOldGuid,
                      arraysize(kIELowRightsPolicyOldGuid)- 1);
   }
 }
 
+// Returns true if this install (as described by |installer_state|) requires
+// Active Setup.
+bool RequiresActiveSetup(const InstallerState& installer_state) {

[grt (UTC plus 2), 2013/01/09 18:57:45]

did you consider making this a method on InstallerState?

[gab, 2013/01/09 19:35:10]

Arg...! Sorry for wasting your time, this is what I intended to do and somehow
didn't do...

Done.

+  return (installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER) &&
+          installer_state.system_install());
+}
+
 // Local helper to call AddRegisterComDllWorkItems for all DLLs in a set of
 // products managed by a given package.
 // |old_version| can be NULL to indicate no Chrome is currently installed.
 void AddRegisterComDllWorkItemsForPackage(const InstallerState& installer_state,
                                           const Version* old_version,
                                           const Version& new_version,
                                           WorkItemList* work_item_list) {
   // First collect the list of DLLs to be registered from each product.
   std::vector<FilePath> com_dll_list;
   installer_state.AddComDllList(&com_dll_list);
@@ skipping 40 matching lines @@
   FilePath installer_dir(installer_state.GetInstallerDirectory(new_version));
   install_list->AddCreateDirWorkItem(installer_dir);
 
   FilePath exe_dst(installer_dir.Append(setup_path.BaseName()));
 
   if (exe_dst != setup_path) {
     install_list->AddCopyTreeWorkItem(setup_path.value(), exe_dst.value(),
                                       temp_path.value(), WorkItem::ALWAYS);
   }
 
+  if (RequiresActiveSetup(installer_state)) {
+    FilePath active_setup_exe(installer_dir.Append(kActiveSetupExe));

[grt (UTC plus 2), 2013/01/09 18:57:45]

suggested comment:
    // Make a copy of setup.exe with a different name so that Active Setup
    // doesn't require an admin on XP thanks to Application Compatibility.

[gab, 2013/01/09 19:35:10]

Done.

+    install_list->AddCopyTreeWorkItem(
+        setup_path.value(), active_setup_exe.value(), temp_path.value(),
+        WorkItem::ALWAYS);
+  }
+
   // If only the App Host (not even the Chrome Binaries) is being installed,
   // this must be a user-level App Host piggybacking on system-level Chrome
   // Binaries. Only setup.exe is required, and only for uninstall.
   if (installer_state.products().size() != 1 ||
       !installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
     FilePath archive_dst(installer_dir.Append(archive_path.BaseName()));
     if (archive_path != archive_dst) {
       // In the past, we copied rather than moved for system level installs so
       // that the permissions of %ProgramFiles% would be picked up.  Now that
       // |temp_path| is in %ProgramFiles% for system level installs (and in
@@ skipping 1212 matching lines @@
   DCHECK(installer_state.operation() != InstallerState::UNINSTALL);
   BrowserDistribution* distribution = product.distribution();
 
   if (!product.is_chrome() || !installer_state.system_install()) {
     const char* install_level =
         installer_state.system_install() ? "system" : "user";
     VLOG(1) << "No Active Setup processing to do for " << install_level
             << "-level " << distribution->GetAppShortCutName();
     return;
   }
+  DCHECK(RequiresActiveSetup(installer_state));

[robertshield, 2013/01/09 18:53:14]

Doesn't this check duplicate that done in the if statement immediately above?

[gab, 2013/01/09 18:56:35]

Right, but as discussed with Greg, putting it here so that anyone eventually
calling this for another product would hit this if they fail to also modify
RequiresActiveSetup().

RequiresActiveSetup() itself though can't replace the above condition as
RequiresActiveSetup() is generic for the entire installer_state and
AddActiveSetupWorkItems() is called per-product.

 
   const HKEY root = HKEY_LOCAL_MACHINE;
   const string16 active_setup_path(
       InstallUtil::GetActiveSetupPath(distribution));
 
   VLOG(1) << "Adding registration items for Active Setup.";
   list->AddCreateRegKeyWorkItem(root, active_setup_path);
   list->AddSetRegValueWorkItem(root, active_setup_path, L"",
                                distribution->GetAppShortCutName(), true);
 
-  CommandLine cmd(installer_state.GetInstallerDirectory(new_version).
-      Append(setup_path.BaseName()));
+  FilePath active_setup_exe(installer_state.GetInstallerDirectory(new_version)
+      .Append(kActiveSetupExe));
+  CommandLine cmd(active_setup_exe);
   cmd.AppendSwitch(installer::switches::kConfigureUserSettings);
   cmd.AppendSwitch(installer::switches::kVerboseLogging);
   cmd.AppendSwitch(installer::switches::kSystemLevel);
   product.AppendProductFlags(&cmd);
   list->AddSetRegValueWorkItem(root, active_setup_path, L"StubPath",
                                cmd.GetCommandLineString(), true);
 
   // TODO(grt): http://crbug.com/75152 Write a reference to a localized
   // resource.
   list->AddSetRegValueWorkItem(root, active_setup_path, L"Localized Name",
@@ skipping 195 matching lines @@
     // Log everything for now.
     cmd_line.AppendSwitch(installer::switches::kVerboseLogging);
 
     AppCommand cmd(cmd_line.GetCommandLineString());
     cmd.set_is_auto_run_on_os_upgrade(true);
     cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list);
   }
 }
 
 }  // namespace installer