Don't register or use the DelegateExecute verb handler if it isn't present.

chrome/installer/setup/install_worker.cc

Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 73b91ba617b570226bfa733b55d1d033ef6803ae..e9b3cf032e55ae3c98793d9e393706a651731447 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -14,6 +14,7 @@
 
 #include "base/command_line.h"
 #include "base/file_path.h"
+#include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ -854,8 +855,8 @@ void AddInstallWorkItems(const InstallationState& original_state,
     AddVersionKeyWorkItems(root, product->distribution(), new_version,
                            add_language_identifier, install_list);
 
-    AddDelegateExecuteWorkItems(original_state, installer_state, setup_path,
-                                new_version, *product, install_list);
+    AddDelegateExecuteWorkItems(installer_state, src_path, new_version,
+                                *product, install_list);
   }
 
   if (installer_state.is_multi_install()) {
@@ -1061,9 +1062,8 @@ void AddChromeFrameWorkItems(const InstallationState& original_state,
   }
 }
 
-void AddDelegateExecuteWorkItems(const InstallationState& original_state,
-                                 const InstallerState& installer_state,
-                                 const FilePath& setup_path,
+void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
+                                 const FilePath& src_path,
                                  const Version& new_version,
                                  const Product& product,
                                  WorkItemList* list) {
@@ -1080,8 +1080,6 @@ void AddDelegateExecuteWorkItems(const InstallationState& original_state,
     return;
   }
 
-  VLOG(1) << "DelegateExecute verb handler COM registration.";
-
   HKEY root = installer_state.root_key();
   const bool is_install =
       (installer_state.operation() != InstallerState::UNINSTALL);
@@ -1092,7 +1090,16 @@ void AddDelegateExecuteWorkItems(const InstallationState& original_state,
   string16 interface_path(L"Software\\Classes\\Interface\\");
   interface_path.append(interface_uuid);
 
-  if (is_install) {
+  // Add work items to register the handler iff it is present.  Remove its
+  // registration otherwise since builds after r132190 included it when it
+  // wasn't strictly necessary.
+  // TODO(grt): remove the extra check for the .exe when it's ever-present;
+  // see also shell_util.cc's GetProgIdEntries.
+  if (is_install &&
+      file_util::PathExists(src_path.AppendASCII(new_version.GetString())
+          .Append(kDelegateExecuteExe))) {
+    VLOG(1) << "Adding DelegateExecute verb handler COM registration items.";
+
     // The path to the exe (in the version directory).
     FilePath delegate_execute(
         installer_state.target_path().AppendASCII(new_version.GetString()));
@@ -1170,6 +1177,8 @@ void AddDelegateExecuteWorkItems(const InstallationState& original_state,
                                  true);
 
   } else {
+    VLOG(1) << "Adding DelegateExecute verb handler COM unregistration items.";

[gab, 2012/04/25 14:59:05]

Don't we want a slightly different log message for install/uninstall behavior
(otherwise we can't tell which path was hit by looking at the log...)?

[grt (UTC plus 2), 2012/04/25 15:09:21]

Moved "{,un}registration" closer to the front of the message.

+
     list->AddDeleteRegKeyWorkItem(root, delegate_execute_path);
     list->AddDeleteRegKeyWorkItem(root, typelib_path);
     list->AddDeleteRegKeyWorkItem(root, interface_path);