Revert "[Merge] [Mac] Add tab and keyboard navigation to 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 89 matching lines @@
   AvatarMenu* menu_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserControllerTest);
 };
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
   switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
+  ASSERT_EQ(1U, [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
   // reproducible anywhere else.
   ASSERT_GE([subviews count], 3U);
 
   // There should be two buttons and a separator in the option buttons view.
@@ skipping 18 matching lines @@
   // 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]);
 
   // Profile icon.
   NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
-  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSButton class]]);
+  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
 
   // Profile name.
   NSView* activeProfileName = [activeCardSubviews objectAtIndex:1];
   EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [base::mac::ObjCCast<NSButton>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button
   // and a signin promo.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
   ASSERT_EQ(2U, [linksSubviews count]);
   NSButton* link = base::mac::ObjCCast<NSButton>(
       [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, InitialLayoutWithFastUserSwitcher) {
   switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   EnableFastUserSwitching();
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
+  ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // Three profiles means we should have one active card and a
   // fast user switcher which has two "other" profiles and 2 separators, and
   // an option buttons view with its separator. We also have a promo for
   // the new avatar menu.
   // TODO(noms): Enforcing 8U fails on the waterfall debug bots, but it's not
   // reproducible anywhere else.
   ASSERT_GE([subviews count], 7U);
 
@@ skipping 22 matching lines @@
     profileIndex++;
   }
 
   // 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:6] subviews];
   ASSERT_EQ(3U, [activeCardSubviews count]);
 
   // Profile icon.
   NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
-  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSButton class]]);
+  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
 
   // Profile name.
   NSView* activeProfileName = [activeCardSubviews objectAtIndex:1];
   EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [base::mac::ObjCCast<NSButton>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button
   // and a signin promo. These are also tested in InitialLayoutWithNewMenu.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
@@ skipping 10 matching lines @@
       CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
                            base::ASCIIToUTF16("New Profile"), 1, std::string(),
                            TestingProfile::TestingFactories());
   testing_profile_manager()->
       CreateTestingProfile("test4", scoped_ptr<PrefServiceSyncable>(),
                            base::ASCIIToUTF16("Another Test"), 1, std::string(),
                            TestingProfile::TestingFactories());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
+  ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSString* sortedNames[] = { @"Another Test",
                               @"New Profile",
                               @"Test 1",
                               @"Test 2" };
   // There are four "other" profiles, each with a button and a separator, an
   // active profile card, and an option buttons view with a separator. We
   // also have an update promo for the new avatar menu.
   // TODO(noms): Enforcing 12U fails on the waterfall debug bots, but it's not
   // reproducible anywhere else.
@@ skipping 11 matching lines @@
     EXPECT_TRUE(
         [[button title] isEqualToString:sortedNames[sortedNameIndex++]]);
   }
 }
 
 TEST_F(ProfileChooserControllerTest,
     LocalProfileActiveCardLinksWithNewMenu) {
   switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
+  ASSERT_EQ(1U, [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.
   NSButton* link = base::mac::ObjCCast<NSButton>(
       [activeCardLinks objectAtIndex:0]);
   EXPECT_EQ(@selector(showInlineSigninPage:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 
   // Local profiles have a signin promo.
   NSTextField* promo = base::mac::ObjCCast<NSTextField>(
       [activeCardLinks objectAtIndex:1]);
   EXPECT_GT([[promo stringValue] length], 0U);
 }
 
 TEST_F(ProfileChooserControllerTest,
        SignedInProfileActiveCardLinksWithAccountConsistency) {
   switches::EnableAccountConsistencyForTesting(
       CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
+  ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
 
   // 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(CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
+  ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
 
   // There is one disabled button with the user's email.
   ASSERT_EQ(1U, [activeCardLinks count]);
   NSButton* emailButton =
       base::mac::ObjCCast<NSButton>([activeCardLinks objectAtIndex:0]);
   EXPECT_EQ(kEmail, base::SysNSStringToUTF8([emailButton title]));
   EXPECT_EQ(nil, [emailButton action]);
@@ skipping 14 matching lines @@
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
       UpdateCredentials(kEmail, kLoginToken);
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
       UpdateCredentials(kSecondaryEmail, kLoginToken);
 
   StartProfileChooserController();
   [controller() initMenuContentsWithView:
       profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT];
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
-  ASSERT_EQ(2U, [subviews count]);
+  ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // There should be one active card, one accounts container, two separators
   // and one option buttons view.
   ASSERT_EQ(5U, [subviews count]);
 
   // There should be three buttons and two separators in the option
   // buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   ASSERT_EQ(5U, [buttonSubviews count]);
@@ skipping 56 matching lines @@
   // There should be another separator.
   EXPECT_TRUE([[subviews objectAtIndex:3] isKindOfClass:[NSBox class]]);
 
   // There should be the profile avatar, name and a "hide accounts" link
   // container in the active card view.
   NSArray* activeCardSubviews = [[subviews objectAtIndex:4] subviews];
   ASSERT_EQ(3U, [activeCardSubviews count]);
 
   // Profile icon.
   NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
-  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSButton class]]);
+  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSImageView class]]);
 
   // Profile name.
   NSView* activeProfileName = [activeCardSubviews objectAtIndex:1];
   EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [base::mac::ObjCCast<NSButton>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
   ASSERT_EQ(1U, [linksSubviews count]);
   NSButton* link = base::mac::ObjCCast<NSButton>(
       [linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(hideAccountManagement:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 }
-
-TEST_F(ProfileChooserControllerTest, SignedInProfileLockDisabled) {
-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
-  // Sign in the first profile.
-  ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
-  cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
-  cache->SetLocalAuthCredentialsOfProfileAtIndex(0, std::string());
-
-  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, one
-  // option buttons view and a lock view. We also have an update promo for the
-  // new avatar menu.
-  // TODO(noms): Enforcing 5U fails on the waterfall debug bots, but it's not
-  // reproducible anywhere else.
-  ASSERT_GE([subviews count], 4U);
-
-  // 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]);
-  ASSERT_TRUE(lockButton);
-  EXPECT_EQ(@selector(lockProfile:), [lockButton action]);
-  EXPECT_EQ(controller(), [lockButton target]);
-  EXPECT_FALSE([lockButton isEnabled]);
-}
-
-TEST_F(ProfileChooserControllerTest, SignedInProfileLockEnabled) {
-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
-  // Sign in the first profile.
-  ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
-  cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
-  cache->SetLocalAuthCredentialsOfProfileAtIndex(0, "YourHashHere");
-
-  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, one
-  // option buttons view and a lock view. We also have an update promo for the
-  // new avatar menu.
-  // TODO(noms): Enforcing 5U fails on the waterfall debug bots, but it's not
-  // reproducible anywhere else.
-  ASSERT_GE([subviews count], 4U);
-
-  // 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]);
-  ASSERT_TRUE(lockButton);
-  EXPECT_EQ(@selector(lockProfile:), [lockButton action]);
-  EXPECT_EQ(controller(), [lockButton target]);
-  EXPECT_TRUE([lockButton isEnabled]);
-}