Refactor of BrowserDistribution.

chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

Index: chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index c918574a9e74c4be731f97df35bbcb1cdb8618c3..2bb90e7cd94b2c6e60aab9f5cc68f48da86a1dbf 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -222,7 +222,9 @@ class ProfileShortcutManagerTest : public testing::Test {
         ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS)) << location.ToString();
     const base::FilePath system_level_shortcut_path =
         GetSystemShortcutsDirectory().Append(
-            distribution->GetAppShortCutName() + installer::kLnkExt);
+            distribution->
+                GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
+                installer::kLnkExt);
     EXPECT_TRUE(file_util::PathExists(system_level_shortcut_path))
         << location.ToString();
     return system_level_shortcut_path;
@@ -310,7 +312,8 @@ TEST_F(ProfileShortcutManagerTest, ShortcutFilenameStripsReservedCharacters) {
   const string16 kSanitizedProfileName = L"Harry";
   BrowserDistribution* distribution = GetDistribution();
   const string16 expected_name = kSanitizedProfileName + L" - " +
-      distribution->GetAppShortCutName() + installer::kLnkExt;
+      distribution->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
+          installer::kLnkExt;
   EXPECT_EQ(expected_name,
             profiles::internal::GetShortcutFilenameForProfile(kProfileName,
                                                               distribution));
@@ -318,9 +321,11 @@ TEST_F(ProfileShortcutManagerTest, ShortcutFilenameStripsReservedCharacters) {
 
 TEST_F(ProfileShortcutManagerTest, UnbadgedShortcutFilename) {
   BrowserDistribution* distribution = GetDistribution();
-  EXPECT_EQ(distribution->GetAppShortCutName() + installer::kLnkExt,
-            profiles::internal::GetShortcutFilenameForProfile(string16(),
-                                                              distribution));
+  EXPECT_EQ(
+      distribution->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
+          installer::kLnkExt,
+      profiles::internal::GetShortcutFilenameForProfile(string16(),
+                                                        distribution));
 }
 
 TEST_F(ProfileShortcutManagerTest, ShortcutFlags) {
@@ -578,7 +583,8 @@ TEST_F(ProfileShortcutManagerTest, UpdateShortcutWithNoFlags) {
                                 false));
   const base::FilePath regular_shortcut_path =
       CreateRegularShortcutWithName(FROM_HERE,
-                                    GetDistribution()->GetAppShortCutName());
+                                    GetDistribution()->GetShortcutName(
+                                        BrowserDistribution::SHORTCUT_CHROME));
 
   // Add another profile and check that the shortcut was replaced with
   // a badged shortcut with the right command line for the profile
@@ -596,7 +602,8 @@ TEST_F(ProfileShortcutManagerTest, UpdateTwoShortcutsWithNoFlags) {
                                 false));
   const base::FilePath regular_shortcut_path =
       CreateRegularShortcutWithName(FROM_HERE,
-                                    GetDistribution()->GetAppShortCutName());
+                                    GetDistribution()->GetShortcutName(
+                                        BrowserDistribution::SHORTCUT_CHROME));
   const base::FilePath customized_regular_shortcut_path =
       CreateRegularShortcutWithName(FROM_HERE, L"MyChrome");