Temporarily ifdef out Active Setup for M22

BUG=NONE
TEST=No Active Setup items installed in registry at system-level Chrome install.


Review URL: https://chromiumcodereview.appspot.com/10837128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150237 0039d316-1c4b-4281-b951-d872f2087c98

chrome/installer/setup/install_worker.cc

@@ -898,8 +898,12 @@ void AddInstallWorkItems(const InstallationState& original_state,
     AddDelegateExecuteWorkItems(installer_state, src_path, new_version,
                                 *product, install_list);
 
+// TODO(gab): This is only disabled for M22 as the shortcut CL using Active
+// Setup will not make it in M22.
+#if 0
     AddActiveSetupWorkItems(installer_state, new_version, *product,
                             install_list);
+#endif
   }
 
   // Add any remaining work items that involve special settings for

chrome/installer/setup/uninstall.cc

@@ -1046,7 +1046,12 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
     }
 
     ProcessDelegateExecuteWorkItems(installer_state, product);
+
+// TODO(gab): This is only disabled for M22 as the shortcut CL using Active
+// Setup will not make it in M22.
+#if 0
     UninstallActiveSetupEntries(installer_state, product);
+#endif
   }
 
   if (product.is_chrome_frame()) {