Change default code flag to NewAvatarMenu.

chrome/browser/notifications/message_center_settings_controller_unittest.cc

Index: chrome/browser/notifications/message_center_settings_controller_unittest.cc
diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
index cd8e18b8656882e7d73ce10fbe188fce2bd271a4..e391501f50bb5c2f6c169292bb7db533cb424e2b 100644
--- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc
+++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
@@ -40,7 +40,14 @@ class MessageCenterSettingsControllerBaseTest : public testing::Test {
   void SetUp() override { ASSERT_TRUE(testing_profile_manager_.SetUp()); }
 
   virtual TestingProfile* CreateProfile(const std::string& name) {
-    return testing_profile_manager_.CreateTestingProfile(name);
+    TestingProfile* profile =
+        testing_profile_manager_.CreateTestingProfile(name);
+    ProfileInfoCache& cache = *testing_profile_manager_.profile_info_cache();

[Jun Mukai, 2015/03/19 16:51:20]

Why not
ProfileInfoCache* cache = testing_profile_manager_.profile_info_cache();
cache->GetAvatar...(cache->GetIndex...())

?

[noms (inactive), 2015/03/19 16:53:16]

nit: const?

[Mike Lerman, 2015/03/19 17:23:56]

I'll go with const &, the standard way of referencing the ProfileInfoCache. Is
that okay, mukai@?

+    // Preload the avatar icon so it's cached for the test's execution.
+    cache.GetAvatarIconOfProfileAtIndex(
+        cache.GetIndexOfProfileWithPath(profile->GetPath()));
+    base::MessageLoop::current()->RunUntilIdle();
+    return profile;
   }
 
   void CreateController() {