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/command_line.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"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "testing/gtest_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 class ProfileMenuControllerTest : public CocoaProfileTest {
  public:
   ProfileMenuControllerTest() {
     item_.reset([[NSMenuItem alloc] initWithTitle:@"Users"
                                            action:nil
                                     keyEquivalent:@""]);
     controller_.reset(
         [[ProfileMenuController alloc] initWithMainMenuItem:item_]);
   }
 
   void SetUp() override {
+    switches::DisableNewAvatarMenuForTesting(

[noms (inactive), 2015/03/09 19:26:17]

Why are we disabling the flag? This is the os menu bar, not the old profile
bubble, right?

[Mike Lerman, 2015/03/10 15:58:58]

Is it? Oh. Trying to count the numbers of items in the ProfileMenuController was
reporting wrong numbers. I'll change this so it works properly with the NewMenu
rather than sticking to the old ones.

Please can you verify that it's supposed to always be showing (even with just
one profile)?

[noms (inactive), 2015/03/17 14:26:30]

At the moment for one profile, it's showing up in the menu bar (it also has the
additional Edit | New options which are useful) but not in the dock menu (I
think this class controls both). 

[Mike Lerman, 2015/03/18 19:29:48]

Okay, good. I'll leave it Enabled then.

+        base::CommandLine::ForCurrentProcess());
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
     // Spin the runloop so |-initializeMenu| gets called.
     chrome::testing::NSRunLoopRunAllPending();
   }
 
   void TestBottomItems() {
     NSMenu* menu = [controller() menu];
     NSInteger count = [menu numberOfItems];
@@ skipping 237 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]);
 }