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 1093 matching lines @@
 
     AddUninstallShortcutWorkItems(installer_state, setup_path, new_version,
                                   product, install_list);
 
     AddVersionKeyWorkItems(root, product.distribution(), new_version,
                            add_language_identifier, install_list);
 
     AddDelegateExecuteWorkItems(installer_state, target_path, new_version,
                                 product, install_list);
 
-    AddActiveSetupWorkItems(installer_state, setup_path, new_version, product,
-                            install_list);
+    AddActiveSetupWorkItems(installer_state, setup_path, temp_path, new_version,
+                            product, install_list);
   }
 
   // Add any remaining work items that involve special settings for
   // each product.
   AddProductSpecificWorkItems(original_state, installer_state, setup_path,
                               new_version, install_list);
 
   // Copy over brand, usagestats, and other values.
   AddGoogleUpdateWorkItems(original_state, installer_state, install_list);
 
@@ skipping 254 matching lines @@
     list->AddSetRegValueWorkItem(root, subkey, L"ServerExecutable",
                                  delegate_execute.value(), true);
 
     subkey.assign(delegate_execute_path).append(L"\\Programmable");
     list->AddCreateRegKeyWorkItem(root, subkey);
   }
 }
 
 void AddActiveSetupWorkItems(const InstallerState& installer_state,
                              const FilePath& setup_path,
+                             const FilePath& temp_path,
                              const Version& new_version,
                              const Product& product,
                              WorkItemList* list) {
   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;
   }
 
   const HKEY root = HKEY_LOCAL_MACHINE;
   const string16 active_setup_path(
       InstallUtil::GetActiveSetupPath(distribution));
 
+  FilePath active_setup_exe(installer_state.GetInstallerDirectory(new_version)
+      .Append(kActiveSetupExe));
+  VLOG(1) << "Adding copy items for " << active_setup_exe.value();
+  list->AddCopyTreeWorkItem(setup_path.value(), active_setup_exe.value(),

[grt (UTC plus 2), 2013/01/09 14:13:15]

AddActiveSetupWorkItems is called once for each product, whereas this copying of
setup.exe should only be done once for the whole install operation (only for the
binaries, I think). I think AddInstallerCopyTasks is the right place for this.

[gab, 2013/01/09 15:39:42]

The early return at the top of this method takes care of this already no?

The reason I put it here is so that we only copy this if we are actually
registering Active Setup (i.e. system-level Chrome only).

+                            temp_path.value(), WorkItem::ALWAYS);
+
   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()));
+  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