Enable the MD User Menu by default on trunk.

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 <memory>
 
 #include "base/command_line.h"
 #import "base/mac/foundation_util.h"
@@ skipping 87 matching lines @@
              anchoredAt:point
                viewMode:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER
            tutorialMode:mode
             serviceType:signin::GAIA_SERVICE_TYPE_NONE
             accessPoint:signin_metrics::AccessPoint::
                             ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN]);
     [controller_ showWindow:nil];
   }
 
   void AssertRightClickTutorialShown() {
+    // The right click menu doesn't exist in the MD user menu, so it doesn't
+    // show the tutorial.
+    if (switches::IsMaterialDesignUserMenu())
+      return;
+
     NSArray* subviews = [[[controller() window] contentView] subviews];
     ASSERT_EQ(2U, [subviews count]);
     subviews = [[subviews objectAtIndex:0] subviews];
 
     // There should be 4 views: the tutorial, the active profile card, a
     // separator and the options view.
     ASSERT_EQ(4U, [subviews count]);
 
     // The tutorial is the topmost view, so the last in the array. It should
     // contain 3 views: the title, the content text and the OK button.
@@ skipping 58 matching lines @@
   // 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 one button in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   NSButton* userSwitcherButton;
   if (switches::IsMaterialDesignUserMenu()) {
-    ASSERT_EQ(1U, [buttonSubviews count]);
+    // There are 2 buttons in the initial layout: "Manage People" and "Guest".
+    ASSERT_EQ(2U, [buttonSubviews count]);
     // There should be a user switcher button.
     userSwitcherButton =
       base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
   } else {
     // For non-material-design user menu, there should be two buttons and a
     // separator in the option buttons view.
     ASSERT_EQ(3U, [buttonSubviews count]);
 
     // There should be an incognito button.
     NSButton* incognitoButton =
         base::mac::ObjCCast<NSButton>([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.
     userSwitcherButton =
       base::mac::ObjCCast<NSButton>([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]]);
+  NSUInteger last_subview_index = switches::IsMaterialDesignUserMenu() ? 4 : 2;

[Robert Sesek, 2016/10/06 18:49:35]

These tests are incorrectly using camelCase for variable names (when under_score
is appropriate for C++ functions). But consistency is the overriding style rule,
so this should probably be named lastSubviewIndex (and throughout the CL).

[anthonyvd, 2016/10/06 19:06:15]

Ahh, makes sense! Done everywhere.

+  NSArray* activeCardSubviews =
+      [[subviews objectAtIndex:last_subview_index] subviews];
 
   // 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]);
+  // In the MD user menu, the profile avatar and name are in the same subview.
+  if (switches::IsMaterialDesignUserMenu()) {
+    ASSERT_EQ(2U, [activeCardSubviews count]);
+  } else {
+    ASSERT_EQ(3U, [activeCardSubviews count]);
 
-  // Profile icon.
-  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
-  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSButton class]]);
+    // Profile icon.
+    NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
+    EXPECT_TRUE([activeProfileImage isKindOfClass:[NSButton 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 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>(
@@ skipping 36 matching lines @@
   StartProfileChooserControllerWithTutorialMode(
       profiles::TUTORIAL_MODE_RIGHT_CLICK_SWITCHING);
   AssertRightClickTutorialShown();
 
   // Dismissing the tutorial should prevent it from being shown forever.
   [controller() dismissTutorial:nil];
   NSArray* 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]);
+  // There should be 3 views since there's no tutorial. There are 2 extra
+  // buttons in the MD user menu.
+  auto views_count = switches::IsMaterialDesignUserMenu() ? 5U : 3U;

[Robert Sesek, 2016/10/06 18:49:35]

Use NSUInteger instead of auto and drop the 'U's?

[anthonyvd, 2016/10/06 19:06:15]

Done.

+  ASSERT_EQ(views_count, [subviews count]);
 
   // Closing and reopening the menu shouldn't show the tutorial.
   [controller() close];
   StartProfileChooserControllerWithTutorialMode(
       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]);
+  ASSERT_EQ(views_count, [subviews count]);
 }
 
 TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
+  // This test is related to the fast user switcher, which doesn't exist under
+  // the MD user menu.
+  if (switches::IsMaterialDesignUserMenu())
+    return;
   // Add two extra profiles, to make sure sorting is alphabetical and not
   // by order of creation.
   testing_profile_manager()->CreateTestingProfile(
       "test3", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
       base::ASCIIToUTF16("New Profile"), 1, std::string(),
       TestingProfile::TestingFactories());
   testing_profile_manager()->CreateTestingProfile(
       "test4", std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
       base::ASCIIToUTF16("Another Test"), 1, std::string(),
       TestingProfile::TestingFactories());
@@ skipping 22 matching lines @@
         [[button title] isEqualToString:sortedNames[sortedNameIndex++]]);
   }
 }
 
 TEST_F(ProfileChooserControllerTest,
     LocalProfileActiveCardLinksWithNewMenu) {
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
-  NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
+  // The active card is the last subview and the MD User Menu has 2 extra
+  // buttons.
+  NSUInteger last_subview_index = switches::IsMaterialDesignUserMenu() ? 4 : 2;
+  NSArray* activeCardSubviews =
+      [[subviews objectAtIndex:last_subview_index] 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(
       base::CommandLine::ForCurrentProcess());
 
   SignInFirstProfile();
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
-  NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
+  // The active card is the last subview and the MD User Menu has 2 extra
+  // buttons.
+  NSUInteger last_subview_index = switches::IsMaterialDesignUserMenu() ? 4 : 2;
+  NSArray* activeCardSubviews =
+      [[subviews objectAtIndex:last_subview_index] 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) {
   SignInFirstProfile();
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
-  NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
+  // The active card is the last subview and the MD User Menu has 2 extra
+  // buttons.
+  NSUInteger last_subview_index = switches::IsMaterialDesignUserMenu() ? 4 : 2;
+  NSArray* activeCardSubviews =
+      [[subviews objectAtIndex:last_subview_index] 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]);
-  EXPECT_FALSE([emailButton isEnabled]);
+  if (switches::IsMaterialDesignUserMenu()) {
+    // There is the profile avatar and the profile name.
+    ASSERT_EQ(2U, [activeCardLinks count]);
+  } else {
+    // 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]);
+    EXPECT_FALSE([emailButton isEnabled]);
+  }
 }
 
 TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
   switches::EnableAccountConsistencyForTesting(
       base::CommandLine::ForCurrentProcess());
 
   SignInFirstProfile();
 
   // Mark that we are using the profile name on purpose, so that we don't
   // fallback to testing the algorithm that chooses which default name
@@ skipping 21 matching lines @@
 
   StartProfileChooserController();
   [controller() initMenuContentsWithView:
       profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT];
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [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]);
+  // and one option buttons view. In the MD User Menu, there are 2 more buttons.
+  auto views_count = switches::IsMaterialDesignUserMenu() ? 7U : 5U;
+  ASSERT_EQ(views_count, [subviews count]);
 
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   NSButton* userSwitcherButton;
   if (switches::IsMaterialDesignUserMenu()) {
-    // There should be one button in the option buttons view.
-    ASSERT_EQ(1U, [buttonSubviews count]);
+    // There should be two buttons in the option buttons view.
+    ASSERT_EQ(2U, [buttonSubviews count]);
     // There should be a user switcher button.
     userSwitcherButton =
         base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
   } else {
     // For non-material-design user menu, there should be two buttons and one
     // separator in the option buttons view.
     ASSERT_EQ(3U, [buttonSubviews count]);
 
     // There should be an incognito button.
     NSButton* incognitoButton =
         base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
     EXPECT_EQ(@selector(goIncognito:), [incognitoButton action]);
     EXPECT_EQ(controller(), [incognitoButton target]);
 
     // There should be a separator.
     EXPECT_TRUE([[buttonSubviews objectAtIndex:1] isKindOfClass:[NSBox class]]);
 
     // There should be a user switcher button.
     userSwitcherButton =
         base::mac::ObjCCast<NSButton>([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]]);
-
+  NSUInteger accounts_view_index = switches::IsMaterialDesignUserMenu() ? 4 : 2;
   // In the accounts view, there should be the account list container
   // accounts and one "add accounts" button.
-  NSArray* accountsSubviews = [[subviews objectAtIndex:2] subviews];
+  NSArray* accountsSubviews =
+      [[subviews objectAtIndex:accounts_view_index] 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]);
@@ skipping 14 matching lines @@
   EXPECT_EQ(@selector(showAccountRemovalView:), [primaryAccountDelete action]);
   EXPECT_EQ(controller(), [primaryAccountDelete target]);
   EXPECT_EQ(-1, [primaryAccountDelete tag]);
 
   // 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]);
+  if (switches::IsMaterialDesignUserMenu()) {
+    // In the MD user menu, the profile name and avatar are in the same subview.
+    ASSERT_EQ(2U, [activeCardSubviews count]);
+  } else {
+    ASSERT_EQ(3U, [activeCardSubviews count]);
 
-  // Profile icon.
-  NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
-  EXPECT_TRUE([activeProfileImage isKindOfClass:[NSButton class]]);
+    // Profile icon.
+    NSView* activeProfileImage = [activeCardSubviews objectAtIndex:2];
+    EXPECT_TRUE([activeProfileImage isKindOfClass:[NSButton 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 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]);
+    // 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(
       base::CommandLine::ForCurrentProcess());
 
   SignInFirstProfile();
 
   // The preference, not the email, determines whether the profile can lock.
   browser()->profile()->GetPrefs()->SetString(
       prefs::kGoogleServicesHostedDomain, "chromium.org");
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   if (switches::IsMaterialDesignUserMenu()) {
-    // There will be one button in the option buttons view.
-    ASSERT_EQ(1U, [buttonSubviews count]);
+    // There will be two buttons in the option buttons view.
+    ASSERT_EQ(2U, [buttonSubviews count]);
   } else {
     // For non-material-design user menu, there will be two buttons and one
     // separators in the option buttons view.
     ASSERT_EQ(3U, [buttonSubviews count]);
   }
 
   // The last button should not be the lock button.
   NSButton* lastButton =
       base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
   ASSERT_TRUE(lastButton);
@@ skipping 30 matching lines @@
   }
 
   // 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]);
 }