Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/ui/browser_command_controller_unittest.cc

Index: chrome/browser/ui/browser_command_controller_unittest.cc
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index a80c7580269c2bda4d415bcf53fdbd1e101d70e7..f293cf8772e43f54aab4045e95f01eeefe515d3d 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -173,15 +173,10 @@ TEST_F(BrowserCommandControllerTest, AppFullScreen) {
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
 }
 
-TEST_F(BrowserCommandControllerTest, OldAvatarMenuEnabledForOneOrMoreProfiles) {
+TEST_F(BrowserCommandControllerTest, AvatarMenuEnabledForOneOrMoreProfiles) {
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
-  // The command line is reset at the end of every test by the test suite.
-  switches::DisableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-  ASSERT_FALSE(switches::IsNewAvatarMenu());

[Peter Kasting, 2015/09/25 23:42:51]

It's not a problem that we used to force-disable this?

[Mike Lerman, 2015/09/28 15:23:01]

I think we can delete this test now. it tested behaviour specific to the old
avatar menu (where we'd only show the icon when there were 2+ profiles), so the
test can be removed.

[anthonyvd, 2015/09/29 20:23:15]

It doesn't seem like it's a problem because the test only asserts that the
number of profiles are what we'd expect and that Ctrl+Shift+M is enabled on
Desktop and disabled on ChromeOS. All those things are independant of the
Old/New avatar state so the force disable was just superflous.

As for removing the test, I'd prefer leaving it in, since it does test that
platform-dependant behavior is WAI. I'll rename it to better reflect what it's
actually testing.

-
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
   ASSERT_TRUE(testing_profile_manager.SetUp());
@@ -215,10 +210,6 @@ TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledWhenOnlyOneProfile) {
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
-  // The command line is reset at the end of every test by the test suite.
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
   ASSERT_TRUE(testing_profile_manager.SetUp());
@@ -257,14 +248,6 @@ TEST_F(BrowserCommandControllerTest, AvatarMenuAlwaysDisabledInIncognitoMode) {
 
   // Both the old style and the new style avatar menu should be disabled.

[Peter Kasting, 2015/09/25 23:42:52]

Nit: "The avatar menu should be disabled."?

[anthonyvd, 2015/09/29 20:23:15]

Done.

   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
-  if (switches::IsNewAvatarMenu()) {
-    switches::DisableNewAvatarMenuForTesting(
-        base::CommandLine::ForCurrentProcess());
-  } else {
-    switches::EnableNewAvatarMenuForTesting(
-        base::CommandLine::ForCurrentProcess());
-  }
-  EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
   // The command line is reset at the end of every test by the test suite.
 }