Quick fix to get 7DA counts for unified Chrome / App Launcher.

chrome/installer/setup/uninstall.cc

Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 295028c86db6fc24a0fcbfb92a555ebf1de049e9..89236675b96f55a73fbdfd0d169ec816040b4f0e 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -24,6 +24,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_result_codes.h"
+#include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "chrome/installer/setup/install.h"
 #include "chrome/installer/setup/install_worker.h"
 #include "chrome/installer/setup/setup_constants.h"
@@ -1231,6 +1232,24 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
     // Notify the shell that associations have changed since Chrome was likely
     // unregistered.
     SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
+
+    // TODO(huangs): Implement actual migration code and remove the hack below.
+    // Remove the "shadow" App Launcher registry keys that gat added.

[grt (UTC plus 2), 2013/05/08 19:36:09]

nit: remove " that gat added"

[huangs, 2013/05/08 20:18:00]

Done.

+    if (installer_state.is_multi_install()) {
+      // If we're not uninstalling the legacy App Launcher, and if it was
+      // not installed in the first place, then delete the "shadow" keys.
+      bool has_legacy_app_launcher =
+          chrome_launcher_support::GetAppLauncherInstallationState()
+              != chrome_launcher_support::NOT_INSTALLED;
+      bool uninstalling_app_launcher = product.is_chrome_app_host();

[grt (UTC plus 2), 2013/05/08 19:36:09]

this will always be false since this whole code block is within an (is_chrome)
conditional.

[huangs, 2013/05/08 20:18:00]

This was meant for the edge case of simultaneous uninstall of legacy App
Launcher (that got updated) and Chrome: we should let App Launcher uninstaller
take care of itself.  However, a normal user would not uninstall two things at
the same time, so removed code.

+      if (!has_legacy_app_launcher && !uninstalling_app_launcher) {
+        BrowserDistribution* shadow_app_launcher_dist =
+            BrowserDistribution::GetSpecificDistribution(
+                BrowserDistribution::CHROME_APP_HOST);
+        InstallUtil::DeleteRegistryKey(reg_root,
+            shadow_app_launcher_dist->GetVersionKey());
+      }
+    }
   }
 
   if (product.is_chrome_frame()) {