Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/profiles/profile_list_desktop_unittest.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/profile_list_desktop.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 264 matching lines @@
   base::FieldTrialList field_trial_list_(NULL);
   base::FieldTrialList::CreateFieldTrial("ShowProfileSwitcher", "AlwaysShow");
 
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
 #else
   EXPECT_TRUE(AvatarMenu::ShouldShowAvatarMenu());
 #endif
 }
 
-TEST_F(ProfileListDesktopTest, DontShowOldAvatarMenuForSingleProfile) {
-  switches::DisableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-
-  manager()->CreateTestingProfile("Test 1");
-
-  EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
-
-  // If multiprofile mode is enabled, there are no other cases when we wouldn't
-  // show the menu.
-  if (profiles::IsMultipleProfilesEnabled())
-    return;
-
-  manager()->CreateTestingProfile("Test 2");
-
-  EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
-}
-
-TEST_F(ProfileListDesktopTest, AlwaysShowNewAvatarMenu) {
-  // If multiprofile mode is not enabled then the menu is never shown.
-  if (!profiles::IsMultipleProfilesEnabled())
-    return;
-
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-
-  manager()->CreateTestingProfile("Test 1");
-
-  EXPECT_TRUE(AvatarMenu::ShouldShowAvatarMenu());
-}
-
 TEST_F(ProfileListDesktopTest, ShowAvatarMenu) {
   // If multiprofile mode is not enabled then the menu is never shown.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   manager()->CreateTestingProfile("Test 1");
   manager()->CreateTestingProfile("Test 2");
 
 #if defined(OS_CHROMEOS)
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
@@ skipping 26 matching lines @@
   base::string16 supervised_user_label =
       l10n_util::GetStringUTF16(IDS_LEGACY_SUPERVISED_USER_AVATAR_LABEL);
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
   EXPECT_NE(item1.username, supervised_user_label);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(item2.username, supervised_user_label);
 }
 
 }  // namespace