Reland of: Change default code flag to NewAvatarMenu.

chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_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/avatar_menu_bubble_controller.h"
 
+#include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump_mac.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "testing/gtest_mac.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/events/test/cocoa_test_event_utils.h"
 
 class AvatarMenuBubbleControllerTest : public CocoaTest {
  public:
   AvatarMenuBubbleControllerTest()
       : manager_(TestingBrowserProcess::GetGlobal()) {
   }
 
   void SetUp() override {
+    switches::DisableNewAvatarMenuForTesting(
+        base::CommandLine::ForCurrentProcess());
+
     CocoaTest::SetUp();
     ASSERT_TRUE(manager_.SetUp());
 
     manager_.CreateTestingProfile("test1", scoped_ptr<PrefServiceSyncable>(),
                                   base::ASCIIToUTF16("Test 1"), 1,
                                   std::string(),
                                   TestingProfile::TestingFactories());
     manager_.CreateTestingProfile("test2", scoped_ptr<PrefServiceSyncable>(),
                                   base::ASCIIToUTF16("Test 2"), 0,
                                   std::string(),
@@ skipping 32 matching lines @@
   AvatarMenu* menu_;
 };
 
 TEST_F(AvatarMenuBubbleControllerTest, InitialLayout) {
   [controller() showWindow:nil];
 
   // Two profiles means two item views and the new button with separator.
   NSView* contents = [[controller() window] contentView];
   EXPECT_EQ(4U, [[contents subviews] count]);
 
-  // Loop over the itmes and match the viewController views to subviews.
+  // Loop over the items and match the viewController views to subviews.
   NSMutableArray* subviews =
       [NSMutableArray arrayWithArray:[contents subviews]];
   for (AvatarMenuItemController* viewController in [controller() items]) {
     for (NSView* subview in subviews) {
       if ([viewController view] == subview) {
         [subviews removeObject:subview];
         break;
       }
     }
   }
@@ skipping 169 matching lines @@
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:0], GetHighlightedItem());
 
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:1], GetHighlightedItem());
 
   // There are no more items now so going up should stay at the first item.
   [controller() keyDown:event];
   EXPECT_EQ([[controller() items] objectAtIndex:1], GetHighlightedItem());
 }