Revert of Change default code flag to NewAvatarMenu.

chrome/browser/ui/cocoa/profiles/avatar_icon_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_icon_controller.h"
 
-#include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
-#include "components/signin/core/common/profile_management_switches.h"
 
 class AvatarIconControllerTest : public CocoaProfileTest {
  public:
   void SetUp() override {
-    switches::DisableNewAvatarMenuForTesting(
-        base::CommandLine::ForCurrentProcess());
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
     controller_.reset(
         [[AvatarIconController alloc] initWithBrowser:browser()]);
     [[controller_ view] setHidden:YES];
   }
 
   void TearDown() override {
     browser()->window()->Close();
@@ skipping 76 matching lines @@
       new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop()));
   // Build a new controller to check if it is initialized correctly for a
   // supervised user profile.
   base::scoped_nsobject<AvatarIconController> controller(
       [[AvatarIconController alloc] initWithBrowser:browser]);
 
   EXPECT_TRUE([controller labelButtonView]);
 
   browser->window()->Close();
 }