Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/profiles/avatar_menu.cc

Index: chrome/browser/profiles/avatar_menu.cc
diff --git a/chrome/browser/profiles/avatar_menu.cc b/chrome/browser/profiles/avatar_menu.cc
index 6b7fee6dcaa640e9eeff7976ab78fa2f0ee355d5..2b5a5924dcd201f9d190ebfa58f285818dc1436a 100644
--- a/chrome/browser/profiles/avatar_menu.cc
+++ b/chrome/browser/profiles/avatar_menu.cc
@@ -39,14 +39,6 @@
 
 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)
@@ -97,27 +89,15 @@ 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) {
@@ -132,15 +112,16 @@ void AvatarMenu::SwitchToProfile(size_t index,
          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);