Removes the new-avatar-menu flags, enabling the feature for all users.

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 649 matching lines @@
   // Other profile names should not be migrated even if they're the old
   // 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
-
-TEST_F(ProfileInfoCacheTest,
-       DontMigrateLegacyProfileNamesWithoutNewAvatarMenu) {
-  switches::DisableNewAvatarMenuForTesting(

[msw, 2015/05/18 18:28:30]

Can you remove this helper, DisableNewAvatarMenuForTesting? I realize you want
to leave most cleanup in another CL, but I wonder if you should remove the flags
and behavior toggling code in this CL?

-      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,
-                                std::string(), base::string16(), 1,
-                                std::string());
-  base::string16 name_3 = ASCIIToUTF16("Lemonade");
-  base::FilePath path_3 = GetProfilePath("path_3");
-  GetCache()->AddProfileToCache(path_3, name_3,
-                                std::string(), base::string16(), 2,
-                                std::string());
-  base::string16 name_4 = ASCIIToUTF16("Batman");
-  base::FilePath path_4 = GetProfilePath("path_4");
-  GetCache()->AddProfileToCache(path_4, name_4,
-                                std::string(), base::string16(), 3,
-                                std::string());
-  EXPECT_EQ(4U, GetCache()->GetNumberOfProfiles());
-
-  ResetCache();
-
-  // 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)));
-}