Reland of: Change default code flag to NewAvatarMenu.

chrome/browser/ui/cocoa/profiles/profile_menu_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_menu_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 62 matching lines @@
 
   NSMenuItem* menu_item() { return item_.get(); }
 
  private:
   base::scoped_nsobject<NSMenuItem> item_;
   base::scoped_nsobject<ProfileMenuController> controller_;
 };
 
 TEST_F(ProfileMenuControllerTest, InitializeMenu) {
   NSMenu* menu = [controller() menu];
-  // <sep>, Edit, <sep>, New.
-  ASSERT_EQ(4, [menu numberOfItems]);
+  // Profile, <sep>, Edit, <sep>, New.
+  ASSERT_EQ(5, [menu numberOfItems]);
 
   TestBottomItems();
 
-  EXPECT_TRUE([menu_item() isHidden]);
+  EXPECT_FALSE([menu_item() isHidden]);
 }
 
 TEST_F(ProfileMenuControllerTest, CreateItemWithTitle) {
   NSMenuItem* item =
       [controller() createItemWithTitle:@"Title"
                                  action:@selector(someSelector:)];
   EXPECT_NSEQ(@"Title", [item title]);
   EXPECT_EQ(controller(), [item target]);
   EXPECT_EQ(@selector(someSelector:), [item action]);
   EXPECT_NSEQ(@"", [item keyEquivalent]);
 }
 
 TEST_F(ProfileMenuControllerTest, RebuildMenu) {
   NSMenu* menu = [controller() menu];
-  EXPECT_EQ(4, [menu numberOfItems]);
+  EXPECT_EQ(5, [menu numberOfItems]);
 
-  EXPECT_TRUE([menu_item() isHidden]);
+  EXPECT_FALSE([menu_item() isHidden]);
 
   // Create some more profiles on the manager.
   TestingProfileManager* manager = testing_profile_manager();
   manager->CreateTestingProfile("Profile 2");
   manager->CreateTestingProfile("Profile 3");
 
   // Verify that the menu got rebuilt.
   ASSERT_EQ(7, [menu numberOfItems]);
 
   NSMenuItem* item = [menu itemAtIndex:0];
   EXPECT_EQ(@selector(switchToProfileFromMenu:), [item action]);
 
   item = [menu itemAtIndex:1];
   EXPECT_EQ(@selector(switchToProfileFromMenu:), [item action]);
 
   item = [menu itemAtIndex:2];
   EXPECT_EQ(@selector(switchToProfileFromMenu:), [item action]);
 
   TestBottomItems();
 
   EXPECT_FALSE([menu_item() isHidden]);
 }
 
 TEST_F(ProfileMenuControllerTest, InsertItems) {
   base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
   ASSERT_EQ(0, [menu numberOfItems]);
 
-  // With only one profile, insertItems should be a no-op.
+  // Even with one profile items can still be inserted.
   BOOL result = [controller() insertItemsIntoMenu:menu
                                          atOffset:0
                                          fromDock:NO];
-  EXPECT_FALSE(result);
-  EXPECT_EQ(0, [menu numberOfItems]);
+  EXPECT_TRUE(result);
+  EXPECT_EQ(1, [menu numberOfItems]);
   [menu removeAllItems];
 
   // Same for use in building the dock menu.
   result = [controller() insertItemsIntoMenu:menu
                                     atOffset:0
                                     fromDock:YES];
   EXPECT_FALSE(result);
   EXPECT_EQ(0, [menu numberOfItems]);
   [menu removeAllItems];
 
@@ skipping 132 matching lines @@
   EXPECT_FALSE([controller() validateMenuItem:item]);
 
   item = [menu itemAtIndex:1];
   ASSERT_EQ(@selector(switchToProfileFromMenu:), [item action]);
   EXPECT_TRUE([controller() validateMenuItem:item]);
 
   item = [menu itemAtIndex:5];
   ASSERT_EQ(@selector(newProfile:), [item action]);
   EXPECT_FALSE([controller() validateMenuItem:item]);
 }