Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/command_line.h"
 #import "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 132 matching lines @@
  private:
   base::scoped_nsobject<ProfileChooserController> controller_;
 
   // Weak; owned by |controller_|.
   AvatarMenu* menu_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserControllerTest);
 };
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // Three profiles means we should have one active card, one separator and
   // one option buttons view. We also have an update promo for the new avatar
   // menu.
   // TODO(noms): Enforcing 4U fails on the waterfall debug bots, but it's not
@@ skipping 45 matching lines @@
       [linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(showInlineSigninPage:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 
   NSTextField* promo = base::mac::ObjCCast<NSTextField>(
       [linksSubviews objectAtIndex:1]);
   EXPECT_GT([[promo stringValue] length], 0U);
 }
 
 TEST_F(ProfileChooserControllerTest, RightClickTutorialShownAfterWelcome) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
   // The welcome upgrade tutorial takes precedence so show it then dismiss it.
   // The right click tutorial should be shown right away.
   StartProfileChooserControllerWithTutorialMode(
       profiles::TUTORIAL_MODE_WELCOME_UPGRADE);
 
   [controller() dismissTutorial:nil];
   AssertRightClickTutorialShown();
 }
 
 TEST_F(ProfileChooserControllerTest, RightClickTutorialShownAfterReopen) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
   // The welcome upgrade tutorial takes precedence so show it then close the
   // menu. Reopening the menu should show the tutorial.
   StartProfileChooserController();
 
   [controller() close];
   StartProfileChooserController();
   AssertRightClickTutorialShown();
 
   // The tutorial must be manually dismissed so it should still be shown after
   // closing and reopening the menu,
   [controller() close];
   StartProfileChooserController();
   AssertRightClickTutorialShown();
 }
 
 TEST_F(ProfileChooserControllerTest, RightClickTutorialNotShownAfterDismiss) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
   // The welcome upgrade tutorial takes precedence so show it then close the
   // menu. Reopening the menu should show the tutorial.
   StartProfileChooserController();
 
   [controller() close];
   StartProfileChooserControllerWithTutorialMode(
       profiles::TUTORIAL_MODE_RIGHT_CLICK_SWITCHING);
   AssertRightClickTutorialShown();
 
   // Dismissing the tutorial should prevent it from being shown forever.
@@ skipping 11 matching lines @@
       profiles::TUTORIAL_MODE_RIGHT_CLICK_SWITCHING);
   subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // There should be 3 views since there's no tutorial
   ASSERT_EQ(3U, [subviews count]);
 }
 
 TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-
   // Add two extra profiles, to make sure sorting is alphabetical and not
   // by order of creation.
   testing_profile_manager()->CreateTestingProfile(
       "test3", scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
       base::ASCIIToUTF16("New Profile"), 1, std::string(),
       TestingProfile::TestingFactories());
   testing_profile_manager()->CreateTestingProfile(
       "test4", scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
       base::ASCIIToUTF16("Another Test"), 1, std::string(),
       TestingProfile::TestingFactories());
@@ skipping 18 matching lines @@
     // The item at index i is the separator.
     NSButton* button = base::mac::ObjCCast<NSButton>(
         [subviews objectAtIndex:i-1]);
     EXPECT_TRUE(
         [[button title] isEqualToString:sortedNames[sortedNameIndex++]]);
   }
 }
 
 TEST_F(ProfileChooserControllerTest,
     LocalProfileActiveCardLinksWithNewMenu) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
 
   ASSERT_EQ(2U, [activeCardLinks count]);
 
   // There should be a sign in button.
@@ skipping 26 matching lines @@
   // There is one link: manage accounts.
   ASSERT_EQ(1U, [activeCardLinks count]);
   NSButton* manageAccountsLink =
       base::mac::ObjCCast<NSButton>([activeCardLinks objectAtIndex:0]);
   EXPECT_EQ(@selector(showAccountManagement:), [manageAccountsLink action]);
   EXPECT_EQ(controller(), [manageAccountsLink target]);
 }
 
 TEST_F(ProfileChooserControllerTest,
     SignedInProfileActiveCardLinksWithNewMenu) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetAuthInfoOfProfileAtIndex(0, kGaiaId, base::ASCIIToUTF16(kEmail));
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
@@ skipping 177 matching lines @@
   ASSERT_EQ(5U, [buttonSubviews count]);
 
   // There should be a lock button.
   NSButton* lockButton =
       base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
   ASSERT_TRUE(lockButton);
   EXPECT_EQ(@selector(lockProfile:), [lockButton action]);
   EXPECT_EQ(controller(), [lockButton target]);
   EXPECT_TRUE([lockButton isEnabled]);
 }