Reland of: Change default code flag to NewAvatarMenu.

chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm

Index: chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
index e2acb1c9f4577f381cb22885cc19b0b5649256d0..ee9bd7b7dcf67d1db455ee3f6b7fff7811d549bd 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller_unittest.mm
@@ -80,12 +80,12 @@ class ProfileMenuControllerTest : public CocoaProfileTest {
 
 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) {
@@ -100,9 +100,9 @@ TEST_F(ProfileMenuControllerTest, CreateItemWithTitle) {
 
 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();
@@ -130,12 +130,12 @@ 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.