Change profile shortcut name format to "<username> - Chrome".

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 267 matching lines @@
   FilePath profile_1_path_;
   string16 profile_2_name_;
   FilePath profile_2_path_;
   string16 profile_3_name_;
   FilePath profile_3_path_;
 };
 
 TEST_F(ProfileShortcutManagerTest, ShortcutFilename) {
   const string16 kProfileName = L"Harry";
   BrowserDistribution* distribution = GetDistribution();
-  const string16 expected_name = kProfileName + L" - " +
-      distribution->GetAppShortCutName() + installer::kLnkExt;
-  EXPECT_EQ(expected_name,
+#if defined(GOOGLE_CHROME_BUILD)

[sail, 2013/02/05 20:30:43]

I don't think this is a good idea. You should use the same constant that the
implementation uses (IDS_SHORT_PRODUCT_NAME or kBrowserAppName)

[Alexei Svitkine (slow), 2013/02/05 20:56:00]

Done.

+  const string16 expected_name = L"Harry - Chrome";
+#else
+  const string16 expected_name = L"Harry - Chromium";
+#endif
+  EXPECT_EQ(expected_name + installer::kLnkExt,
             profiles::internal::GetShortcutFilenameForProfile(kProfileName,
                                                               distribution));
 }
 
 TEST_F(ProfileShortcutManagerTest, ShortcutLongFilenameIsTrimmed) {
   const string16 kLongProfileName = L"Harry Harry Harry Harry Harry Harry Harry"
       L"Harry Harry Harry Harry Harry Harry Harry Harry Harry Harry Harry"
       L"Harry Harry Harry Harry Harry Harry Harry Harry Harry Harry Harry";
   const string16 file_name =
       profiles::internal::GetShortcutFilenameForProfile(kLongProfileName,
@@ skipping 431 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));
 }