Change semantics of newProfileManagement() to accountConsistency()

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"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 133 matching lines @@
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
   EnableNewAvatarMenuOnly();
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   EXPECT_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. In
-  // this flow we also have the tutorial view.
-  EXPECT_EQ(6U, [subviews count]);
+  // fast user switcher which has two "other" profiles and 2 separators.
+  EXPECT_EQ(5U, [subviews count]);
 
   // 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 = 3; i >= 0; i -= 2) {
     // Each profile button has a separator.
     EXPECT_TRUE([[subviews objectAtIndex:i] isKindOfClass:[NSBox class]]);
 
     NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i-1]);
     EXPECT_EQ(menu()->GetItemAt(profileIndex).name,
@@ skipping 18 matching lines @@
   EXPECT_TRUE([activeProfileName isKindOfClass:[NSButton class]]);
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [static_cast<NSButton*>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
   EXPECT_EQ(1U, [linksSubviews count]);
   NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(showTabbedSigninPage:), [link action]);
   EXPECT_EQ(controller(), [link target]);
-
-  // There is a tutorial view card at the top.
-  EXPECT_TRUE([[subviews objectAtIndex:5] isKindOfClass:[NSView class]]);
 }
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithFastUserSwitcher) {
   switches::EnableNewProfileManagementForTesting(
       CommandLine::ForCurrentProcess());
   EnableFastUserSwitching();
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   EXPECT_EQ(1U, [subviews count]);
@@ skipping 50 matching lines @@
                            TestingProfile::TestingFactories());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   EXPECT_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 a tutorial card.
-  EXPECT_EQ(10U, [subviews count]);
+  // There are four "other" profiles, each with a button and a separator, and an
+  // active profile card.
+  EXPECT_EQ(9U, [subviews count]);
   // There should be four "other profiles" items, sorted alphabetically.
   // The "other profiles" start at index 0, 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 = 7; i >= 0; i -= 2) {
     // The item at index i is the separator.
     NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i-1]);
     EXPECT_TRUE(
         [[button title] isEqualToString:sortedNames[sortedNameIndex++]]);
@@ skipping 31 matching lines @@
 
   // There should be one "sign in" link.
   EXPECT_EQ(1U, [activeCardLinks count]);
   NSButton* signinLink =
       static_cast<NSButton*>([activeCardLinks objectAtIndex:0]);
   EXPECT_EQ(@selector(showTabbedSigninPage:), [signinLink action]);
   EXPECT_EQ(controller(), [signinLink target]);
 }
 
 TEST_F(ProfileChooserControllerTest,
-       SignedInProfileActiveCardLinksWithNewManagement) {
-  switches::EnableNewProfileManagementForTesting(
+       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];
   EXPECT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
@@ skipping 24 matching lines @@
   // There is one link, without a target and with the user's email.
   EXPECT_EQ(1U, [activeCardLinks count]);
   NSButton* emailLink =
       static_cast<NSButton*>([activeCardLinks objectAtIndex:0]);
   EXPECT_EQ(nil, [emailLink action]);
   EXPECT_EQ(kEmail, base::SysNSStringToUTF8([emailLink title]));
   EXPECT_EQ(controller(), [emailLink target]);
 }
 
 TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
-  switches::EnableNewProfileManagementForTesting(
+  switches::EnableAccountConsistencyForTesting(
       CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
 
   // Set up the signin manager and the OAuth2Tokens.
   Profile* profile = browser()->profile();
   SigninManagerFactory::GetForProfile(profile)->
       SetAuthenticatedUsername(kEmail);
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
@@ skipping 81 matching lines @@
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [static_cast<NSButton*>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
   EXPECT_EQ(1U, [linksSubviews count]);
   NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(hideAccountManagement:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 }