Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/profiles/profile_info_cache_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_info_cache_unittest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 533 matching lines @@
     names.push_back(name);
   }
 
   for (size_t i = 0; i < 4; i++)
     ASSERT_FALSE(names[i].empty());
 }
 
 // High res avatar downloading is only supported on desktop.
 #if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
 TEST_F(ProfileInfoCacheTest, DownloadHighResAvatarTest) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-
   // The TestingProfileManager's ProfileInfoCache doesn't download avatars.
   ProfileInfoCache profile_info_cache(g_browser_process->local_state(),
       testing_profile_manager_.profile_manager()->user_data_dir());
 
   // Make sure there are no avatars already on disk.
   const size_t kIconIndex = 0;
   base::FilePath icon_path =
       profiles::GetPathOfHighResAvatarAtIndex(kIconIndex);
   EXPECT_FALSE(base::PathExists(icon_path));
 
@@ skipping 43 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Clean up.
   EXPECT_NE(std::string::npos, icon_path.MaybeAsASCII().find(file_name));
   EXPECT_TRUE(base::PathExists(icon_path));
   EXPECT_TRUE(base::DeleteFile(icon_path, true));
   EXPECT_FALSE(base::PathExists(icon_path));
 }
 
 TEST_F(ProfileInfoCacheTest, NothingToDownloadHighResAvatarTest) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-
   // The TestingProfileManager's ProfileInfoCache doesn't download avatars.
   ProfileInfoCache profile_info_cache(
       g_browser_process->local_state(),
       testing_profile_manager_.profile_manager()->user_data_dir());
 
   const size_t kIconIndex = profiles::GetPlaceholderAvatarIndex();
 
   EXPECT_EQ(0U, profile_info_cache.GetNumberOfProfiles());
   base::FilePath path_1 = GetProfilePath("path_1");
   profile_info_cache.AddProfileToCache(path_1, ASCIIToUTF16("name_1"),
                                        std::string(), base::string16(),
                                        kIconIndex, std::string());
   EXPECT_EQ(1U, profile_info_cache.GetNumberOfProfiles());
   base::RunLoop().RunUntilIdle();
 
   // We haven't tried to download any high-res avatars as the specified icon is
   // just a placeholder.
   EXPECT_EQ(0U, profile_info_cache.cached_avatar_images_.size());
   EXPECT_EQ(0U, profile_info_cache.avatar_images_downloads_in_progress_.size());
 }
 
 TEST_F(ProfileInfoCacheTest, MigrateLegacyProfileNamesWithNewAvatarMenu) {
-  switches::EnableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
   EXPECT_EQ(0U, GetCache()->GetNumberOfProfiles());
 
   base::FilePath path_1 = GetProfilePath("path_1");
   GetCache()->AddProfileToCache(path_1, ASCIIToUTF16("Default Profile"),
                                 std::string(), base::string16(), 0,
                                 std::string());
   base::FilePath path_2 = GetProfilePath("path_2");
   GetCache()->AddProfileToCache(path_2, ASCIIToUTF16("First user"),
                                 std::string(), base::string16(), 1,
                                 std::string());
@@ skipping 29 matching lines @@
   // default cartoon profile names.
   EXPECT_EQ(name_3, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_3)));
   EXPECT_EQ(name_4, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_4)));
   EXPECT_EQ(name_5, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_5)));
 }
 #endif
 
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
 TEST_F(ProfileInfoCacheTest,
        DontMigrateLegacyProfileNamesWithoutNewAvatarMenu) {
-  switches::DisableNewAvatarMenuForTesting(
-      base::CommandLine::ForCurrentProcess());
-
   EXPECT_EQ(0U, GetCache()->GetNumberOfProfiles());
 
   base::string16 name_1 = ASCIIToUTF16("Default Profile");
   base::FilePath path_1 = GetProfilePath("path_1");
   GetCache()->AddProfileToCache(path_1, name_1,
                                 std::string(), base::string16(), 0,
                                 std::string());
   base::string16 name_2 = ASCIIToUTF16("First user");
   base::FilePath path_2 = GetProfilePath("path_2");
   GetCache()->AddProfileToCache(path_2, name_2,
@@ skipping 16 matching lines @@
   // Profile names should have been preserved.
   EXPECT_EQ(name_1, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_1)));
   EXPECT_EQ(name_2, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_2)));
   EXPECT_EQ(name_3, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_3)));
   EXPECT_EQ(name_4, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_4)));
 }
+#endif