Revert 288817 "[Mac, Win] Only show the user manager tutorial if..."

trunk/src/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 83 matching lines @@
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
   switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   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.
-  ASSERT_EQ(4U, [subviews count]);
+  // one option buttons view.
+  ASSERT_EQ(3U, [subviews count]);
 
   // 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 =
       static_cast<NSButton*>([buttonSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(goIncognito:), [incognitoButton action]);
   EXPECT_EQ(controller(), [incognitoButton target]);
@@ skipping 42 matching lines @@
   switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   EnableFastUserSwitching();
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   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.
-  ASSERT_EQ(8U, [subviews count]);
+  // an option buttons view with its separator.
+  ASSERT_EQ(7U, [subviews count]);
 
   // There should be two buttons and a separator in the option buttons view.
   // These buttons are tested in InitialLayoutWithNewMenu.
   NSArray* buttonSubviews = [[subviews objectAtIndex:0] subviews];
   ASSERT_EQ(3U, [buttonSubviews count]);
 
   // 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
@@ skipping 50 matching lines @@
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   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.
-  ASSERT_EQ(12U, [subviews count]);
+  // active profile card, and an option buttons view with a separator.
+  ASSERT_EQ(11U, [subviews count]);
   // 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 = static_cast<NSButton*>([subviews objectAtIndex:i-1]);
     EXPECT_TRUE(
@@ skipping 174 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];
   ASSERT_EQ(1U, [linksSubviews count]);
   NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(hideAccountManagement:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 }