[Mac] Allow "Enter" to activate the buttons in the new avatar bubble.

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 77 matching lines @@
            tutorialMode:profiles::TUTORIAL_MODE_NONE
             serviceType:signin::GAIA_SERVICE_TYPE_NONE]);
     [controller_ showWindow:nil];
   }
 
   void EnableFastUserSwitching() {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kFastUserSwitching);
   }
 
+  NSButton* GetButtonFromButtonContainer(NSView* container) {
+    return base::mac::ObjCCast<NSButton>(
+        [[container subviews] objectAtIndex:0]);
+  }
+
   ProfileChooserController* controller() { return controller_; }
   AvatarMenu* menu() { return menu_; }
 
  private:
   base::scoped_nsobject<ProfileChooserController> controller_;
 
   // Weak; owned by |controller_|.
   AvatarMenu* menu_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserControllerTest);
@@ skipping 14 matching lines @@
   // TODO(noms): Enforcing 4U fails on the waterfall debug bots, but it's not
   // reproducible anywhere else.
   ASSERT_GE([subviews count], 3U);
 
   // There should be two buttons and a separator in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   ASSERT_EQ(3U, [buttonSubviews count]);
 
   // There should be an incognito button.
   NSButton* incognitoButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
+      GetButtonFromButtonContainer([buttonSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(goIncognito:), [incognitoButton action]);
   EXPECT_EQ(controller(), [incognitoButton target]);
 
   // There should be a separator.
   EXPECT_TRUE([[subviews objectAtIndex:1] isKindOfClass:[NSBox class]]);
 
   // There should be a user switcher button.
   NSButton* userSwitcherButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:2]);
+      GetButtonFromButtonContainer([buttonSubviews objectAtIndex:2]);
   EXPECT_EQ(@selector(showUserManager:), [userSwitcherButton action]);
   EXPECT_EQ(controller(), [userSwitcherButton target]);
 
   // There should be a separator.
   EXPECT_TRUE([[subviews objectAtIndex:1] isKindOfClass:[NSBox class]]);
 
   // There should be the profile avatar, name and links container in the active
   // card view. The links displayed in the container are checked separately.
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   ASSERT_EQ(3U, [activeCardSubviews count]);
@@ skipping 48 matching lines @@
   // There should be a separator.
   EXPECT_TRUE([[subviews objectAtIndex:1] isKindOfClass:[NSBox class]]);
 
   // There should be two "other profiles" items. The items are drawn from the
   // bottom up, so in the opposite order of those in the AvatarMenu.
   int profileIndex = 1;
   for (int i = 5; i >= 2; i -= 2) {
     // Each profile button has a separator.
     EXPECT_TRUE([[subviews objectAtIndex:i] isKindOfClass:[NSBox class]]);
 
-    NSButton* button = base::mac::ObjCCast<NSButton>(
+    NSButton* button = GetButtonFromButtonContainer(
         [subviews objectAtIndex:i-1]);
     EXPECT_EQ(menu()->GetItemAt(profileIndex).name,
               base::SysNSStringToUTF16([button title]));
     EXPECT_EQ(profileIndex, [button tag]);
     EXPECT_EQ(@selector(switchToProfile:), [button action]);
     EXPECT_EQ(controller(), [button target]);
     profileIndex++;
   }
 
   // There should be the profile avatar, name and links container in the active
@@ skipping 48 matching lines @@
   // reproducible anywhere else.
   ASSERT_GE([subviews count], 11U);
   // There should be four "other profiles" items, sorted alphabetically. The
   // "other profiles" start at index 2 (after the option buttons view and its
   // separator), and each have a separator. We need to iterate through the
   // profiles in the order displayed in the bubble, which is opposite from the
   // drawn order.
   int sortedNameIndex = 0;
   for (int i = 9; i >= 2; i -= 2) {
     // The item at index i is the separator.
-    NSButton* button = base::mac::ObjCCast<NSButton>(
+    NSButton* button = GetButtonFromButtonContainer(
         [subviews objectAtIndex:i-1]);
     EXPECT_TRUE(
         [[button title] isEqualToString:sortedNames[sortedNameIndex++]]);
   }
 }
 
 TEST_F(ProfileChooserControllerTest,
     LocalProfileActiveCardLinksWithNewMenu) {
   switches::EnableNewAvatarMenuForTesting(
       base::CommandLine::ForCurrentProcess());
@@ skipping 101 matching lines @@
   // There should be three buttons and two separators in the option
   // buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   ASSERT_EQ(3U, [buttonSubviews count]);
 
   // There should be a separator.
   EXPECT_TRUE([[buttonSubviews objectAtIndex:1] isKindOfClass:[NSBox class]]);
 
   // There should be an incognito button.
   NSButton* incognitoButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
+      GetButtonFromButtonContainer([buttonSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(goIncognito:), [incognitoButton action]);
   EXPECT_EQ(controller(), [incognitoButton target]);
 
   // There should be a separator.
   EXPECT_TRUE([[subviews objectAtIndex:3] isKindOfClass:[NSBox class]]);
 
   // There should be a user switcher button.
   NSButton* userSwitcherButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:2]);
+      GetButtonFromButtonContainer([buttonSubviews objectAtIndex:2]);
   EXPECT_EQ(@selector(showUserManager:), [userSwitcherButton action]);
   EXPECT_EQ(controller(), [userSwitcherButton target]);
 
   // In the accounts view, there should be the account list container
   // accounts and one "add accounts" button.
   NSArray* accountsSubviews = [[subviews objectAtIndex:2] subviews];
   ASSERT_EQ(2U, [accountsSubviews count]);
 
   NSButton* addAccountsButton =
       base::mac::ObjCCast<NSButton>([accountsSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(addAccount:), [addAccountsButton action]);
   EXPECT_EQ(controller(), [addAccountsButton target]);
 
   // There should be two accounts in the account list container.
   NSArray* accountsListSubviews = [[accountsSubviews objectAtIndex:1] subviews];
   ASSERT_EQ(2U, [accountsListSubviews count]);
 
   NSButton* genericAccount =
       base::mac::ObjCCast<NSButton>([accountsListSubviews objectAtIndex:0]);
   NSButton* genericAccountDelete = base::mac::ObjCCast<NSButton>(
-  [[genericAccount subviews] objectAtIndex:0]);
+      [[genericAccount subviews] objectAtIndex:0]);
   EXPECT_EQ(@selector(showAccountRemovalView:), [genericAccountDelete action]);
   EXPECT_EQ(controller(), [genericAccountDelete target]);
   EXPECT_NE(-1, [genericAccountDelete tag]);
 
   // Primary accounts are always last.
   NSButton* primaryAccount =
       base::mac::ObjCCast<NSButton>([accountsListSubviews objectAtIndex:1]);
   NSButton* primaryAccountDelete = base::mac::ObjCCast<NSButton>(
       [[primaryAccount subviews] objectAtIndex:0]);
   EXPECT_EQ(@selector(showAccountRemovalView:), [primaryAccountDelete action]);
@@ skipping 41 matching lines @@
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // There will be two buttons and one separators in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   ASSERT_EQ(3U, [buttonSubviews count]);
 
   // The last button should not be the lock button.
   NSButton* lastButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
+      GetButtonFromButtonContainer([buttonSubviews objectAtIndex:0]);
   ASSERT_TRUE(lastButton);
   EXPECT_NE(@selector(lockProfile:), [lastButton action]);
 }
 
 TEST_F(ProfileChooserControllerTest, SignedInProfileLockEnabled) {
   switches::EnableNewProfileManagementForTesting(
       base::CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
   // The preference, not the email, determines whether the profile can lock.
   browser()->profile()->GetPrefs()->SetString(
       prefs::kGoogleServicesHostedDomain, "google.com");
   // Lock is only available where a supervised user is present.
   cache->SetSupervisedUserIdOfProfileAtIndex(1, kEmail);
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // There will be three buttons and two separators in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   ASSERT_EQ(5U, [buttonSubviews count]);
 
   // There should be a lock button.
   NSButton* lockButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
+      GetButtonFromButtonContainer([buttonSubviews objectAtIndex:0]);
   ASSERT_TRUE(lockButton);
   EXPECT_EQ(@selector(lockProfile:), [lockButton action]);
   EXPECT_EQ(controller(), [lockButton target]);
   EXPECT_TRUE([lockButton isEnabled]);
 }