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..cd36c11d77805347dbdc35e337c49800c28647c8 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -368,7 +368,8 @@ string16 ShellIntegration::GetChromiumIconLocation() {
 
   return ShellUtil::FormatIconLocation(
       chrome_exe.value(),
-      BrowserDistribution::GetDistribution()->GetIconIndex());
+      BrowserDistribution::GetDistribution()->
+          GetShortcutInfo(BrowserDistribution::SHORTCUT_CHROME).icon_index);
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {
@@ -511,7 +512,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