Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3386)

Unified Diff: chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

Issue 1926403002: Remove BrowserDistribution::SHORTCUT_APP_LAUNCHER (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160406-Mac-EnableAppLauncher0
Patch Set: lint headers Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_shortcut_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9e0e4dc75a72404bbbbc2d093c4fbb59423eec42..b23911067560eae4f21f33d6da029cbb91ca6869 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -230,10 +230,8 @@ class ProfileShortcutManagerTest : public testing::Test {
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;
@@ -328,11 +326,9 @@ TEST_F(ProfileShortcutManagerTest, ShortcutFilenameStripsReservedCharacters) {
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) {
@@ -589,10 +585,8 @@ TEST_F(ProfileShortcutManagerTest, UpdateShortcutWithNoFlags) {
// 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
@@ -608,10 +602,8 @@ TEST_F(ProfileShortcutManagerTest, UpdateTwoShortcutsWithNoFlags) {
// 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");
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_shortcut_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698