Added flags for previous code change

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 163 matching lines @@
 
   // 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 one button in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
-  ASSERT_EQ(1U, [buttonSubviews count]);
+  NSButton* userSwitcherButton;
+  if (switches::IsMaterialDesignUserMenu()) {
+    ASSERT_EQ(1U, [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 a user switcher button.
-  NSButton* userSwitcherButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
+    // 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]);
+  }
+

[Roger Tawa OOO till Jul 10th, 2016/06/06 13:37:12]

This won't test both cases, only the default case.  Maybe be OK though.

   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 216 matching lines @@
       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]);
 
-  // There should be one button in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
-  ASSERT_EQ(1U, [buttonSubviews count]);
+  NSButton* userSwitcherButton;
+  if (switches::IsMaterialDesignUserMenu()) {
+    // There should be one button in the option buttons view.
+    ASSERT_EQ(1U, [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 a user switcher button.
-  NSButton* userSwitcherButton =
-      base::mac::ObjCCast<NSButton>([buttonSubviews objectAtIndex:0]);
+    // 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]]);
 
   // 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]);
@@ skipping 59 matching lines @@
 
   // 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];
 
-  // There will be one button in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
-  ASSERT_EQ(1U, [buttonSubviews count]);
+  if (switches::IsMaterialDesignUserMenu()) {
+    // There will be one button in the option buttons view.
+    ASSERT_EQ(1U, [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);
   EXPECT_NE(@selector(lockProfile:), [lastButton action]);
 }
 
 TEST_F(ProfileChooserControllerTest, SignedInProfileLockEnabled) {
   switches::EnableNewProfileManagementForTesting(
       base::CommandLine::ForCurrentProcess());
 
   SignInFirstProfile();
 
   // 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.
   ProfileAttributesEntry* entry = testing_profile_manager()->
       profile_attributes_storage()->GetAllProfilesAttributes().front();
   entry->SetSupervisedUserId(kEmail);
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(2U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
-  // There will be two buttons and one separator in the option buttons view.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
-  ASSERT_EQ(3U, [buttonSubviews count]);
+  if (switches::IsMaterialDesignUserMenu()) {
+    // There will be two buttons and one separator in the option buttons view.
+    ASSERT_EQ(3U, [buttonSubviews count]);
+  } else {
+    // FOr non-material-design user menu, There will be three buttons and two
+    // separators in the option buttons view.
+    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]);
 }