Change new-avatar-menu to an enable-disable flag.

chrome/browser/ui/cocoa/profiles/profile_chooser_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_chooser_controller.h"
 
 #include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 57 matching lines @@
     NSRect frame = [test_window() frame];
     NSPoint point = NSMakePoint(NSMidX(frame), NSMidY(frame));
     controller_.reset([[ProfileChooserController alloc]
         initWithBrowser:browser()
              anchoredAt:point
                withMode:profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER
         withServiceType:signin::GAIA_SERVICE_TYPE_NONE]);
     [controller_ showWindow:nil];
   }
 
-  void EnableNewAvatarMenuOnly() {
-    CommandLine::ForCurrentProcess()->AppendSwitch(switches::kNewAvatarMenu);
-  }
-
   void EnableFastUserSwitching() {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kFastUserSwitching);
   }
 
   ProfileChooserController* controller() { return controller_; }
   AvatarMenu* menu() { return menu_; }
 
  private:
   base::scoped_nsobject<ProfileChooserController> controller_;
 
   // Weak; owned by |controller_|.
   AvatarMenu* menu_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserControllerTest);
 };
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
-  EnableNewAvatarMenuOnly();
+  switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // Three profiles means we should have one active card, one separator and
   // one option buttons view.
   ASSERT_EQ(3U, [subviews count]);
 
@@ skipping 41 matching lines @@
   NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(showInlineSigninPage:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 
   NSTextField* promo = static_cast<NSTextField*>(
       [linksSubviews objectAtIndex:1]);
   EXPECT_GT([[promo stringValue] length], 0U);
 }
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithFastUserSwitcher) {
-  EnableNewAvatarMenuOnly();
+  switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   EnableFastUserSwitching();
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
 
   // Three profiles means we should have one active card and a
   // fast user switcher which has two "other" profiles and 2 separators, and
   // an option buttons view with its separator.
@@ skipping 38 matching lines @@
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [static_cast<NSButton*>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button
   // and a signin promo. These are also tested in InitialLayoutWithNewMenu.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
   EXPECT_EQ(2U, [linksSubviews count]);
 }
 
 TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
-  EnableNewAvatarMenuOnly();
+  switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   EnableFastUserSwitching();
 
   // Add two extra profiles, to make sure sorting is alphabetical and not
   // by order of creation.
   testing_profile_manager()->
       CreateTestingProfile("test3", scoped_ptr<PrefServiceSyncable>(),
                            base::ASCIIToUTF16("New Profile"), 1, std::string(),
                            TestingProfile::TestingFactories());
   testing_profile_manager()->
       CreateTestingProfile("test4", scoped_ptr<PrefServiceSyncable>(),
@@ skipping 20 matching lines @@
   for (int i = 9; i >= 2; i -= 2) {
     // The item at index i is the separator.
     NSButton* button = static_cast<NSButton*>([subviews objectAtIndex:i-1]);
     EXPECT_TRUE(
         [[button title] isEqualToString:sortedNames[sortedNameIndex++]]);
   }
 }
 
 TEST_F(ProfileChooserControllerTest,
     LocalProfileActiveCardLinksWithNewMenu) {
-  EnableNewAvatarMenuOnly();
+  switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
 
   ASSERT_EQ(2U, [activeCardLinks count]);
 
   // There should be a sign in button.
@@ skipping 25 matching lines @@
   // There is one link: manage accounts.
   ASSERT_EQ(1U, [activeCardLinks count]);
   NSButton* manageAccountsLink =
       static_cast<NSButton*>([activeCardLinks objectAtIndex:0]);
   EXPECT_EQ(@selector(showAccountManagement:), [manageAccountsLink action]);
   EXPECT_EQ(controller(), [manageAccountsLink target]);
 }
 
 TEST_F(ProfileChooserControllerTest,
     SignedInProfileActiveCardLinksWithNewMenu) {
-  EnableNewAvatarMenuOnly();
+  switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
 
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   ASSERT_EQ(1U, [subviews count]);
   subviews = [[subviews objectAtIndex:0] subviews];
   NSArray* activeCardSubviews = [[subviews objectAtIndex:2] subviews];
   NSArray* activeCardLinks = [[activeCardSubviews objectAtIndex:0] subviews];
@@ skipping 113 matching lines @@
   EXPECT_EQ(menu()->GetItemAt(0).name, base::SysNSStringToUTF16(
       [static_cast<NSButton*>(activeProfileName) title]));
 
   // Profile links. This is a local profile, so there should be a signin button.
   NSArray* linksSubviews = [[activeCardSubviews objectAtIndex:0] subviews];
   ASSERT_EQ(1U, [linksSubviews count]);
   NSButton* link = static_cast<NSButton*>([linksSubviews objectAtIndex:0]);
   EXPECT_EQ(@selector(hideAccountManagement:), [link action]);
   EXPECT_EQ(controller(), [link target]);
 }