Add default icon to app_host.exe, and use it in shortcuts during installation.

chrome/installer/setup/install_worker.cc

Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 2ef5660e3141f79a088857e02643586f4d49fd5a..b80f2f85cd6bcfeca31c0feb9895a22a21a53bb2 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -621,12 +621,10 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
                                          install_path.value(),
                                          true);
 
-    // TODO(huangs): Generalize this, so app_host.exe can get its own icon,
-    // and not rely on chrome.exe's.
-    // DisplayIcon, NoModify and NoRepair
-    string16 chrome_icon = ShellUtil::GetChromeIcon(
-        product.distribution(),
-        install_path.Append(installer::kChromeExe).value());
+    BrowserDistribution* dist = product.distribution();
+    string16 chrome_icon = ShellUtil::GetIconString(
+        install_path.Append(dist->GetIconFilename()).value(),
+        dist->GetIconIndex());
     install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
                                          L"DisplayIcon", chrome_icon, true);
     install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,