Chromium Code Reviews| Index: chrome/browser/profiles/profile_list_desktop_unittest.cc |
| diff --git a/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chrome/browser/profiles/profile_list_desktop_unittest.cc |
| index bd79226cf028f4d07267c4ccb144e1d0e8790cba..2b053192611c10dc70a8ed2c80bbc568a02e14de 100644 |
| --- a/chrome/browser/profiles/profile_list_desktop_unittest.cc |
| +++ b/chrome/browser/profiles/profile_list_desktop_unittest.cc |
| @@ -282,10 +282,8 @@ TEST_F(ProfileListDesktopTest, ShowAvatarMenuInTrial) { |
| #endif |
| } |
| +#if defined(OS_CHROMEOS) |
|
Mike Lerman
2015/09/28 15:23:01
ChromeOS doesn't have an old avatar menu anyways,
anthonyvd
2015/09/29 20:23:15
True, it can show the icon but never the menu.
|
| TEST_F(ProfileListDesktopTest, DontShowOldAvatarMenuForSingleProfile) { |
| - switches::DisableNewAvatarMenuForTesting( |
| - base::CommandLine::ForCurrentProcess()); |
| - |
| manager()->CreateTestingProfile("Test 1"); |
| EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); |
| @@ -299,15 +297,13 @@ TEST_F(ProfileListDesktopTest, DontShowOldAvatarMenuForSingleProfile) { |
| EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu()); |
| } |
| +#endif |
| TEST_F(ProfileListDesktopTest, AlwaysShowNewAvatarMenu) { |
| // If multiprofile mode is not enabled then the menu is never shown. |
| if (!profiles::IsMultipleProfilesEnabled()) |
| return; |
| - switches::EnableNewAvatarMenuForTesting( |
| - base::CommandLine::ForCurrentProcess()); |
| - |
| manager()->CreateTestingProfile("Test 1"); |
| EXPECT_TRUE(AvatarMenu::ShouldShowAvatarMenu()); |
|
Mike Lerman
2015/09/28 15:23:01
Given this method implementation just does an OS c
anthonyvd
2015/09/29 20:23:15
Done.
|