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

chrome/browser/shell_integration_win.cc

Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 32790758ac80e8dca1611102a0d4ba660584e21b..aa45a1c06ed1ba60f7ddb767c6b9c9b4818df450 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -425,20 +425,18 @@ string16 ShellIntegration::GetAppListAppModelIdForProfile(
                                                    profile_path);
 }
 
-string16 ShellIntegration::GetChromiumIconPath() {
-  // Determine the app path. If we can't determine what that is, we have
-  // bigger fish to fry...
-  FilePath app_path;
-  if (!PathService::Get(base::FILE_EXE, &app_path)) {
+string16 ShellIntegration::GetChromiumIconLocation() {
+  // Determine the path to chrome.exe. If we can't determine what that is,
+  // we have bigger fish to fry...
+  FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return string16();
   }
 
-  string16 icon_path(app_path.value());
-  icon_path.push_back(',');
-  icon_path += base::IntToString16(
+  return ShellUtil::FormatIconLocation(
+      chrome_exe.value(),
       BrowserDistribution::GetDistribution()->GetIconIndex());
-  return icon_path;
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {