Removing deprecated DCHECK's that require App Launcher to be user-level only.

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index b8ebe94fd372897dac60815ae6fae078910fd018..6e32616d522775115ad59d8132eaaac65a28e49f 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -536,16 +536,19 @@ InstallStatus InstallOrUpdateProduct(
         installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST);
     // Creates shortcuts for App Launcher.
     if (app_launcher_product) {
-      // TODO(huangs): Remove this check once we have system-level App Host.
-      DCHECK(!installer_state.system_install());

[gab, 2013/05/28 14:51:39]

I don't think we need to remove this DCHECK for now, it is not part of the ones
that we are hitting at Chrome install/uninstall due to the shadow keys, right?

[huangs, 2013/05/28 14:57:04]

Agreed; there's no need to wipe out the same TODO in the same CL. Removing
change and clicking "commit" (to run tests).

-      const base::FilePath app_host_exe(
-          installer_state.target_path().Append(kChromeAppHostExe));
-      InstallShortcutOperation app_launcher_shortcut_operation =
-          GetAppLauncherShortcutOperation(original_state, installer_state);
-
-      // Always install per-user shortcuts for App Launcher.
-      CreateOrUpdateShortcuts(app_host_exe, *app_launcher_product, prefs,
-                              CURRENT_USER, app_launcher_shortcut_operation);
+      if (!installer_state.system_install()) {
+        const base::FilePath app_host_exe(
+            installer_state.target_path().Append(kChromeAppHostExe));
+        InstallShortcutOperation app_launcher_shortcut_operation =
+            GetAppLauncherShortcutOperation(original_state, installer_state);
+
+        // Always install per-user shortcuts for App Launcher.
+        CreateOrUpdateShortcuts(app_host_exe, *app_launcher_product, prefs,
+                                CURRENT_USER, app_launcher_shortcut_operation);
+      } else {
+        VLOG(1) << "Skipping shortcut creation for system-level legacy "
+                   "App Launcher";
+      }
     }
 
     const Product* chrome_product =