Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/profiles/avatar_menu.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/profiles/avatar_menu.h"
 
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 21 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
 using content::BrowserThread;
 
-namespace {
-
-// Constants for the show profile switcher experiment
-const char kShowProfileSwitcherFieldTrialName[] = "ShowProfileSwitcher";
-const char kAlwaysShowSwitcherGroupName[] = "AlwaysShow";
-
-}  // namespace
-
 AvatarMenu::AvatarMenu(ProfileInfoInterface* profile_cache,
                        AvatarMenuObserver* observer,
                        Browser* browser)
     : profile_list_(ProfileList::Create(profile_cache)),
       menu_actions_(AvatarMenuActions::Create()),
 #if defined(ENABLE_SUPERVISED_USERS)
       supervised_user_observer_(this),
 #endif
       profile_info_(profile_cache),
       observer_(observer),
@@ skipping 30 matching lines @@
       signin_required(false),
       menu_index(menu_index),
       profile_index(profile_index) {
 }
 
 AvatarMenu::Item::~Item() {
 }
 
 // static
 bool AvatarMenu::ShouldShowAvatarMenu() {
-  if (base::FieldTrialList::FindFullName(kShowProfileSwitcherFieldTrialName) ==
-      kAlwaysShowSwitcherGroupName) {
-    // We should only be in this group when multi-profiles is enabled.
-    DCHECK(profiles::IsMultipleProfilesEnabled());
-    return true;
-  }
-
   // TODO: Eliminate this ifdef. Add a delegate interface for the menu which
   // would also help remove the Browser dependency in AvatarMenuActions
   // implementations.
-  if (profiles::IsMultipleProfilesEnabled()) {
 #if defined(OS_CHROMEOS)
-    // On ChromeOS the menu will not be shown.
-    return false;
+  // On ChromeOS the menu will not be shown.
+  return false;
 #else
-    return switches::IsNewAvatarMenu() ||
-           (g_browser_process->profile_manager() &&
-            g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
+  return true;
 #endif
-  }
-  return false;
 }
 
 bool AvatarMenu::CompareItems(const Item* item1, const Item* item2) {
   return base::i18n::ToLower(item1->name).compare(
       base::i18n::ToLower(item2->name)) < 0;
 }
 
 void AvatarMenu::SwitchToProfile(size_t index,
                                  bool always_create,
                                  ProfileMetrics::ProfileOpen metric) {
   DCHECK(profiles::IsMultipleProfilesEnabled() ||
          index == GetActiveProfileIndex());
   const Item& item = GetItemAt(index);
 
-  if (switches::IsNewAvatarMenu()) {
-    // Don't open a browser window for signed-out profiles.
-    if (item.signin_required) {
-      UserManager::Show(item.profile_path,
-                        profiles::USER_MANAGER_NO_TUTORIAL,
-                        profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
-      return;
-    }
+#if !defined(OS_CHROMEOS)
+  // ChromeOS doesn't have the User Manager, it can't open it.

[Mike Lerman, 2015/09/28 15:23:01]

ChromeOS, also, I don't think will ever set signin_required for the item to
true, because "lock" is set on a ChromeOS user not a ChromeOS profile. So I
don't think the #if is really necessary, but please verify.

[anthonyvd, 2015/09/29 20:23:15]

It looks like it does here:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...
unfortunately.

+  // Don't open a browser window for signed-out profiles.
+  if (item.signin_required) {
+    UserManager::Show(item.profile_path,
+                      profiles::USER_MANAGER_NO_TUTORIAL,
+                      profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
+    return;
   }
+#endif
 
   base::FilePath path =
       profile_info_->GetPathOfProfileAtIndex(item.profile_index);
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   if (browser_)
     desktop_type = browser_->host_desktop_type();
 
   profiles::SwitchToProfile(path, desktop_type, always_create,
                             ProfileManager::CreateCallback(),
@@ skipping 137 matching lines @@
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }
 #endif
 
 void AvatarMenu::Update() {
   RebuildMenu();
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }