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

chrome/installer/setup/install.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.
 
 #include "chrome/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 518 matching lines @@
 
     if (result == FIRST_INSTALL_SUCCESS && !prefs_path.empty())
       CopyPreferenceFileForFirstRun(installer_state, prefs_path);
 
     installer_state.UpdateStage(installer::CREATING_SHORTCUTS);
 
     const Product* app_launcher_product =
         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);
+      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);
+        // 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 =
         installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER);
     // Creates shortcuts for Chrome.
     if (chrome_product) {
       BrowserDistribution* chrome_dist = chrome_product->distribution();
       const base::FilePath chrome_exe(
           installer_state.target_path().Append(kChromeExe));
       CleanupLegacyShortcuts(installer_state, chrome_dist, chrome_exe);
@@ skipping 130 matching lines @@
   if (app_host_path.empty())
     return false;
 
   CommandLine cmd(app_host_path);
   cmd.AppendSwitchASCII(::switches::kInstallFromWebstore, app_code);
   VLOG(1) << "App install command: " << cmd.GetCommandLineString();
   return base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
 
 }  // namespace installer