Refactor of BrowserDistribution.

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 fb1bd643b7d061084fed2ec030ee51c53bc17a58..c11d5f98121cb1a4c82333796a464a6f8dab54ba 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -357,20 +357,6 @@ string16 ShellIntegration::GetAppListAppModelIdForProfile(
       GetAppListAppName(), profile_path);
 }
 
-string16 ShellIntegration::GetChromiumIconLocation() {
-  // Determine the path to chrome.exe. If we can't determine what that is,
-  // we have bigger fish to fry...
-  base::FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
-    NOTREACHED();
-    return string16();
-  }
-
-  return ShellUtil::FormatIconLocation(
-      chrome_exe.value(),
-      BrowserDistribution::GetDistribution()->GetIconIndex());
-}
-
 void ShellIntegration::MigrateChromiumShortcuts() {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
@@ -511,7 +497,8 @@ base::FilePath ShellIntegration::GetStartMenuShortcut(
     base::DIR_START_MENU,
   };
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  string16 shortcut_name(dist->GetAppShortCutName());
+  string16 shortcut_name(
+      dist->GetShortcutInfo(BrowserDistribution::SHORTCUT_CHROME).name);
   base::FilePath shortcut;
 
   // Check both the common and the per-user Start Menu folders for system-level