Remove references to IsNewAvatarMenu since the flag was removed.

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

Index: chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
index 8c700806d6c3377b1f9c9f089f8140c2c521390a..4cdae2be46cb879bb491ee9b811a9510782bf195 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
@@ -16,8 +16,11 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
+#import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/info_bubble_window.h"
+#import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/testing_profile.h"
@@ -27,15 +30,13 @@
 
 class AvatarIconControllerTest : public CocoaProfileTest {
  public:
+  // Incognito, which is the only way to show the icon
+  AvatarIconControllerTest(bool incognito)
+      : CocoaProfileTest(incognito) {}
+
   void SetUp() override {
-    switches::DisableNewAvatarMenuForTesting(
-        base::CommandLine::ForCurrentProcess());
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
-
-    controller_.reset(
-        [[AvatarIconController alloc] initWithBrowser:browser()]);
-    [[controller_ view] setHidden:YES];
   }
 
   void TearDown() override {
@@ -43,86 +44,30 @@ class AvatarIconControllerTest : public CocoaProfileTest {
     CocoaProfileTest::TearDown();
   }
 
-  NSButton* button() { return [controller_ buttonView]; }
-
-  NSView* view() { return [controller_ view]; }
-
-  AvatarIconController* controller() { return controller_.get(); }
-
- private:
-  base::scoped_nsobject<AvatarIconController> controller_;
+  AvatarBaseController* icon_controller() {
+    BrowserWindowCocoa* window = (BrowserWindowCocoa*)browser()->window();
+    return [window->cocoa_controller() avatarButtonController];
+  }
 };
 
-TEST_F(AvatarIconControllerTest, AddRemoveProfiles) {
-  EXPECT_TRUE([view() isHidden]);
-
-  testing_profile_manager()->CreateTestingProfile("one");
-
-  EXPECT_FALSE([view() isHidden]);
-
-  testing_profile_manager()->CreateTestingProfile("two");
-  EXPECT_FALSE([view() isHidden]);
-
-  testing_profile_manager()->DeleteTestingProfile("one");
-  EXPECT_FALSE([view() isHidden]);
-
-  testing_profile_manager()->DeleteTestingProfile("two");
-  EXPECT_TRUE([view() isHidden]);
-}
-
-TEST_F(AvatarIconControllerTest, DoubleOpen) {
-  // Create a second profile to enable the avatar menu.
-  testing_profile_manager()->CreateTestingProfile("p2");
-
-  EXPECT_FALSE([controller() menuController]);
-
-  [button() performClick:button()];
-
-  BaseBubbleController* menu = [controller() menuController];
-  EXPECT_TRUE([menu isKindOfClass:[AvatarMenuBubbleController class]]);
-
-  EXPECT_TRUE(menu);
-
-  [button() performClick:button()];
-  EXPECT_EQ(menu, [controller() menuController]);
-
-  // Do not animate out because that is hard to test around.
-  static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations =
-      info_bubble::kAnimateNone;
-  [menu close];
-  EXPECT_FALSE([controller() menuController]);
+class AvatarIconControllerIncognitoTest : public AvatarIconControllerTest {
+ public:
+  AvatarIconControllerIncognitoTest() : AvatarIconControllerTest(true) {}
+};
 
-  testing_profile_manager()->DeleteTestingProfile("p2");
+TEST_F(AvatarIconControllerIncognitoTest, ShowingAvatarIcon) {
+  // In incognito, we should be using the AvatarIconController to show the
+  // incognito guy.
+  EXPECT_TRUE([icon_controller() isKindOfClass:[AvatarIconController class]]);
 }
 
-TEST_F(AvatarIconControllerTest, SupervisedUserLabel) {
-  DCHECK(!profile()->IsSupervised());
-  EXPECT_FALSE([controller() labelButtonView]);
-
-  // Create a second, supervised profile to enable the avatar menu.
-  std::string name = "p2";
-  TestingProfile* profile = testing_profile_manager()->CreateTestingProfile(
-      name, scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
-      base::ASCIIToUTF16(name), 0, "asdf", TestingProfile::TestingFactories());
-  EXPECT_TRUE(profile->IsSupervised());
-
-  // http://crbug.com/39725
-  TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
-      profile, &TemplateURLServiceFactory::BuildInstanceFor);
-  AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
-      profile, &AutocompleteClassifierFactory::BuildInstanceFor);
-  profile->CreateBookmarkModel(true);
-  bookmarks::test::WaitForBookmarkModelToLoad(
-      BookmarkModelFactory::GetForProfile(profile));
-
-  Browser* browser =
-      new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop()));
-  // Build a new controller to check if it is initialized correctly for a
-  // supervised user profile.
-  base::scoped_nsobject<AvatarIconController> controller(
-      [[AvatarIconController alloc] initWithBrowser:browser]);
-
-  EXPECT_TRUE([controller labelButtonView]);
+class AvatarIconControllerRegularSessionTest : public AvatarIconControllerTest {
+ public:
+  AvatarIconControllerRegularSessionTest() : AvatarIconControllerTest(false) {}
+};
 
-  browser->window()->Close();
+TEST_F(AvatarIconControllerRegularSessionTest, ShowingAvatarButton) {
+  // In a regular session, we should be using the AvatarButtonController to show
+  // the profile name.
+  EXPECT_TRUE([icon_controller() isKindOfClass:[AvatarButtonController class]]);
 }