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

chrome/installer/setup/uninstall.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 defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <windows.h>
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #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"
 #include "chrome/installer/setup/setup_util.h"
 #include "chrome/installer/util/auto_launch_util.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ skipping 1187 matching lines @@
 
     ProcessDelegateExecuteWorkItems(installer_state, product);
 
     ProcessOnOsUpgradeWorkItems(installer_state, product);
 
     UninstallActiveSetupEntries(installer_state, product);
 
     // 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()) {
     ProcessChromeFrameWorkItems(original_state, installer_state, setup_path,
                                 product);
   }
 
   if (installer_state.is_multi_install()) {
     ProcessGoogleUpdateItems(original_state, installer_state, product);
 
@@ skipping 165 matching lines @@
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(target_path);
   } else if (DeleteApplicationProductAndVendorDirectories(target_path) ==
              installer::DELETE_FAILED) {
     *uninstall_status = installer::UNINSTALL_FAILED;
   }
 }
 
 }  // namespace installer