Change new-avatar-menu to an enable-disable flag.

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/file_util.h"
@@ skipping 513 matching lines @@
 
   ASSERT_EQ(4U, GetCache()->GetNumberOfProfiles());
 
   // Check that the profiles can be extracted from the local state.
   std::vector<base::string16> names = ProfileInfoCache::GetProfileNames();
   for (size_t i = 0; i < 4; i++)
     ASSERT_FALSE(names[i].empty());
 }
 
 TEST_F(ProfileInfoCacheTest, DownloadHighResAvatarTest) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kNewAvatarMenu);
+  switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
 
   EXPECT_EQ(0U, GetCache()->GetNumberOfProfiles());
   base::FilePath path_1 = GetProfilePath("path_1");
   GetCache()->AddProfileToCache(path_1, ASCIIToUTF16("name_1"),
                                 base::string16(), 0, std::string());
   EXPECT_EQ(1U, GetCache()->GetNumberOfProfiles());
 
   // We haven't downloaded any high-res avatars yet.
   EXPECT_EQ(0U, GetCache()->cached_avatar_images_.size());
 
@@ skipping 31 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Clean up.
   base::FilePath icon_path =
       profiles::GetPathOfHighResAvatarAtIndex(kIconIndex);
   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));
 }