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(),
-                                  TestingProfile::TestingFactories());
+    testing_profile_manager()->CreateTestingProfile(

[Scott Hess - ex-Googler, 2015/03/07 04:33:07]

Why are you going to the point of making this change?  The other unit test in
this CL uses testing_profile_manager_., so this doesn't make things consistent
(or maybe it does and that one should also change to make things consistent).

[Mike Lerman, 2015/03/09 14:28:34]

You're right. I had made this change as part of an alternate solution and didn't
revert it back. I should, though - no need to make unnecessary changes. Makes
git blame harder to follow.

[Scott Hess - ex-Googler, 2015/03/09 15:36:27]

OK - that's kind of what I figured, but wondered if maybe it was a long-term
adjustment you were aiming for ...

+        "test1", scoped_ptr<PrefServiceSyncable>(),
+        base::ASCIIToUTF16("Test 1"), 1,
+        std::string(),
+        TestingProfile::TestingFactories());
+    testing_profile_manager()->CreateTestingProfile(
+        "test2", scoped_ptr<PrefServiceSyncable>(),
+        base::ASCIIToUTF16("Test 2"), 0,
+        std::string(),
+        TestingProfile::TestingFactories());
 
-    menu_ = new AvatarMenu(manager_.profile_info_cache(), NULL, NULL);
+    menu_ = new AvatarMenu(testing_profile_manager()->profile_info_cache(),
+                           NULL, NULL);
     menu_->RebuildMenu();
 
     NSRect frame = [test_window() frame];
     NSPoint point = NSMakePoint(NSMidX(frame), NSMidY(frame));
     controller_ =
         [[AvatarMenuBubbleController alloc] initWithMenu:menu()
                                              parentWindow:test_window()
                                                anchoredAt:point];
   }
 
-  TestingProfileManager* manager() { return &manager_; }
+  TestingProfileManager* testing_profile_manager() { return &manager_; }
   AvatarMenuBubbleController* controller() { return controller_; }
   AvatarMenu* menu() { return menu_; }
 
   AvatarMenuItemController* GetHighlightedItem() {
     for (AvatarMenuItemController* item in [controller() items]) {
       if ([item isHighlighted])
         return item;
     }
     return nil;
   }
 
  private:
   TestingProfileManager manager_;
 
   // Weak; releases self.
   AvatarMenuBubbleController* controller_;
 
   // Weak; owned by |controller_|.
   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 26 matching lines @@
 
 TEST_F(AvatarMenuBubbleControllerTest, PerformLayout) {
   [controller() showWindow:nil];
 
   NSView* contents = [[controller() window] contentView];
   EXPECT_EQ(4U, [[contents subviews] count]);
 
   base::scoped_nsobject<NSMutableArray> oldItems([[controller() items] copy]);
 
   // Now create a new profile and notify the delegate.
-  manager()->CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
-                                  base::ASCIIToUTF16("Test 3"), 0,
-                                  std::string(),
-                                  TestingProfile::TestingFactories());
+  testing_profile_manager()->CreateTestingProfile(
+      "test3", scoped_ptr<PrefServiceSyncable>(),
+      base::ASCIIToUTF16("Test 3"), 0,
+      std::string(),
+      TestingProfile::TestingFactories());
 
   // Testing the bridge is not worth the effort...
   [controller() performLayout];
 
   EXPECT_EQ(5U, [[contents subviews] count]);
 
   // Make sure that none of the old items exit.
   NSArray* newItems = [controller() items];
   for (AvatarMenuItemController* oldVC in oldItems.get()) {
     EXPECT_FALSE([newItems containsObject:oldVC]);
@@ skipping 119 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());
 }