Refactor of BrowserDistribution.

chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <objbase.h>  // For CoInitialize().
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/message_loop.h"
@@ skipping 205 matching lines @@
       const tracked_objects::Location& location) {
     BrowserDistribution* distribution = GetDistribution();
     installer::Product product(distribution);
     ShellUtil::ShortcutProperties properties(ShellUtil::SYSTEM_LEVEL);
     product.AddDefaultShortcutProperties(GetExePath(), &properties);
     EXPECT_TRUE(ShellUtil::CreateOrUpdateShortcut(
         ShellUtil::SHORTCUT_LOCATION_DESKTOP, distribution, properties,
         ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS)) << location.ToString();
     const base::FilePath system_level_shortcut_path =
         GetSystemShortcutsDirectory().Append(
-            distribution->GetAppShortCutName() + installer::kLnkExt);
+            distribution->GetShortcutInfo(BrowserDistribution::SHORTCUT_CHROME)

[huangs, 2013/05/21 21:35:41]

What happened to .name?

[gab, 2013/05/21 21:46:45]

This should be using the subfolder anyways.

[calamity, 2013/05/24 02:03:11]

Why? Isn't this chrome.lnk?

[gab, 2013/05/24 15:01:35]

Oh, yes, my bad!

+            + installer::kLnkExt);
     EXPECT_TRUE(file_util::PathExists(system_level_shortcut_path))
         << location.ToString();
     return system_level_shortcut_path;
   }
 
   void RenameProfile(const tracked_objects::Location& location,
                      const base::FilePath& profile_path,
                      const string16& new_profile_name) {
     const size_t profile_index =
         profile_info_cache_->GetIndexOfProfileWithPath(profile_2_path_);
@@ skipping 67 matching lines @@
       profiles::internal::GetShortcutFilenameForProfile(kLongProfileName,
                                                         GetDistribution());
   EXPECT_LT(file_name.size(), kLongProfileName.size());
 }
 
 TEST_F(ProfileShortcutManagerTest, ShortcutFilenameStripsReservedCharacters) {
   const string16 kProfileName = L"<Harry/>";
   const string16 kSanitizedProfileName = L"Harry";
   BrowserDistribution* distribution = GetDistribution();
   const string16 expected_name = kSanitizedProfileName + L" - " +
-      distribution->GetAppShortCutName() + installer::kLnkExt;
+      distribution->GetShortcutInfo(BrowserDistribution::SHORTCUT_CHROME).name
+      + installer::kLnkExt;
   EXPECT_EQ(expected_name,
             profiles::internal::GetShortcutFilenameForProfile(kProfileName,
                                                               distribution));
 }
 
 TEST_F(ProfileShortcutManagerTest, UnbadgedShortcutFilename) {
   BrowserDistribution* distribution = GetDistribution();
-  EXPECT_EQ(distribution->GetAppShortCutName() + installer::kLnkExt,
-            profiles::internal::GetShortcutFilenameForProfile(string16(),
-                                                              distribution));
+  EXPECT_EQ(
+      distribution->GetShortcutInfo(BrowserDistribution::SHORTCUT_CHROME).name
+          + installer::kLnkExt,
+      profiles::internal::GetShortcutFilenameForProfile(string16(),
+                                                        distribution));
 }
 
 TEST_F(ProfileShortcutManagerTest, ShortcutFlags) {
   const string16 kProfileName = L"MyProfileX";
   const base::FilePath profile_path =
       profile_info_cache_->GetUserDataDir().Append(kProfileName);
   EXPECT_EQ(L"--profile-directory=\"" + kProfileName + L"\"",
             profiles::internal::CreateProfileShortcutFlags(profile_path));
 }
 
@@ skipping 237 matching lines @@
 
 TEST_F(ProfileShortcutManagerTest, UpdateShortcutWithNoFlags) {
   SetupDefaultProfileShortcut(FROM_HERE);
 
   // Delete the shortcut that got created for this profile and instead make
   // a new one without any command-line flags.
   ASSERT_TRUE(file_util::Delete(GetDefaultShortcutPathForProfile(string16()),
                                 false));
   const base::FilePath regular_shortcut_path =
       CreateRegularShortcutWithName(FROM_HERE,
-                                    GetDistribution()->GetAppShortCutName());
+                                    GetDistribution()->GetShortcutInfo(
+                                    BrowserDistribution::SHORTCUT_CHROME).name);
 
   // Add another profile and check that the shortcut was replaced with
   // a badged shortcut with the right command line for the profile
   CreateProfileWithShortcut(FROM_HERE, profile_2_name_, profile_2_path_);
   EXPECT_FALSE(file_util::PathExists(regular_shortcut_path));
   ValidateProfileShortcut(FROM_HERE, profile_1_name_, profile_1_path_);
 }
 
 TEST_F(ProfileShortcutManagerTest, UpdateTwoShortcutsWithNoFlags) {
   SetupDefaultProfileShortcut(FROM_HERE);
@@ skipping 173 matching lines @@
   profile_info_cache_->DeleteProfileFromCache(profile_2_path_);
   RunPendingTasks();
 
   // Verify that only the system-level shortcut still exists.
   EXPECT_TRUE(file_util::PathExists(system_level_shortcut_path));
   EXPECT_FALSE(file_util::PathExists(
                    GetDefaultShortcutPathForProfile(string16())));
   EXPECT_FALSE(file_util::PathExists(profile_1_shortcut_path));
   EXPECT_FALSE(file_util::PathExists(profile_2_shortcut_path));
 }