Remove BrowserDistribution::SHORTCUT_APP_LAUNCHER

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 <stddef.h>
 
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 212 matching lines @@
   base::FilePath CreateRegularSystemLevelShortcut(
       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->
-                GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
-                installer::kLnkExt);
+        GetSystemShortcutsDirectory().Append(distribution->GetShortcutName() +
+                                             installer::kLnkExt);
     EXPECT_TRUE(base::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 base::string16& new_profile_name) {
     ProfileAttributesEntry* entry;
     ASSERT_TRUE(profile_attributes_storage_->
@@ skipping 74 matching lines @@
   BrowserDistribution* distribution = GetDistribution();
   const base::string16 expected_name = kSanitizedProfileName + L" - " +
       l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME) + installer::kLnkExt;
   EXPECT_EQ(expected_name,
             profiles::internal::GetShortcutFilenameForProfile(kProfileName,
                                                               distribution));
 }
 
 TEST_F(ProfileShortcutManagerTest, UnbadgedShortcutFilename) {
   BrowserDistribution* distribution = GetDistribution();
-  EXPECT_EQ(
-      distribution->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
-          installer::kLnkExt,
-      profiles::internal::GetShortcutFilenameForProfile(base::string16(),
-                                                        distribution));
+  EXPECT_EQ(distribution->GetShortcutName() + installer::kLnkExt,
+            profiles::internal::GetShortcutFilenameForProfile(base::string16(),
+                                                              distribution));
 }
 
 TEST_F(ProfileShortcutManagerTest, ShortcutFlags) {
   const base::string16 kProfileName = L"MyProfileX";
   const base::FilePath profile_path =
       profile_manager_->profiles_dir().Append(kProfileName);
   EXPECT_EQ(L"--profile-directory=\"" + kProfileName + L"\"",
             profiles::internal::CreateProfileShortcutFlags(profile_path));
 }
 
@@ skipping 236 matching lines @@
   ValidateProfileShortcut(FROM_HERE, new_profile_2_name, profile_2_path_);
 }
 
 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(base::DeleteFile(
       GetDefaultShortcutPathForProfile(base::string16()), false));
-  const base::FilePath regular_shortcut_path =
-      CreateRegularShortcutWithName(FROM_HERE,
-                                    GetDistribution()->GetShortcutName(
-                                        BrowserDistribution::SHORTCUT_CHROME));
+  const base::FilePath regular_shortcut_path = CreateRegularShortcutWithName(
+      FROM_HERE, GetDistribution()->GetShortcutName());
 
   // 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(base::PathExists(regular_shortcut_path));
   ValidateProfileShortcut(FROM_HERE, profile_1_name_, profile_1_path_);
 }
 
 TEST_F(ProfileShortcutManagerTest, UpdateTwoShortcutsWithNoFlags) {
   SetupDefaultProfileShortcut(FROM_HERE);
 
   // Delete the shortcut that got created for this profile and instead make
   // two new ones without any command-line flags.
   ASSERT_TRUE(base::DeleteFile(
       GetDefaultShortcutPathForProfile(base::string16()), false));
-  const base::FilePath regular_shortcut_path =
-      CreateRegularShortcutWithName(FROM_HERE,
-                                    GetDistribution()->GetShortcutName(
-                                        BrowserDistribution::SHORTCUT_CHROME));
+  const base::FilePath regular_shortcut_path = CreateRegularShortcutWithName(
+      FROM_HERE, GetDistribution()->GetShortcutName());
   const base::FilePath customized_regular_shortcut_path =
       CreateRegularShortcutWithName(FROM_HERE, L"MyChrome");
 
   // Add another profile and check that one shortcut was renamed and that the
   // other shortcut was updated but kept the same name.
   CreateProfileWithShortcut(FROM_HERE, profile_2_name_, profile_2_path_);
   EXPECT_FALSE(base::PathExists(regular_shortcut_path));
   ValidateProfileShortcutAtPath(FROM_HERE, customized_regular_shortcut_path,
                                 profile_1_path_);
   ValidateProfileShortcut(FROM_HERE, profile_1_name_, profile_1_path_);
@@ skipping 410 matching lines @@
       GetDefaultShortcutPathForProfile(profile_2_name_)));
   EXPECT_TRUE(base::PathExists(profile_3_shortcut_path));
   profile_attributes_storage_->RemoveProfile(profile_2_path_);
   RunPendingTasks();
   EXPECT_FALSE(base::PathExists(
       GetDefaultShortcutPathForProfile(profile_2_name_)));
   // Only profile3 exists. There should be non-profile shortcut only.
   EXPECT_FALSE(base::PathExists(profile_3_shortcut_path));
   ValidateNonProfileShortcut(FROM_HERE);
 }