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..4947d5ea7d8b152d77ec48fc9258d7a62f523fb4 100644
--- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc
+++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
@@ -40,7 +40,15 @@ 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);
+    const ProfileInfoCache& cache =
+        *testing_profile_manager_.profile_info_cache();
+    // Preload the avatar icon so it's cached for the test's execution.
+    cache.GetAvatarIconOfProfileAtIndex(
+        cache.GetIndexOfProfileWithPath(profile->GetPath()));

[Jun Mukai, 2015/03/19 18:27:45]

Personally I think it would be better to be a pointer.
Invoking a method for some 'preloading' doesn't look like a task of a const
method. Indeed GetAvatarIconOfProfileAtIndex() is const method for some reasons,
but if you want to make a side effect like preparing data for this method, I
think a mutable pointer would be matching.

Anyways I don't have strong opinions. It's up to you.

[Jun Mukai, 2015/03/19 18:34:24]

Ah, could you also add more comments for why this is necessary?
If you remove this new code, what kind of bad thing do we have?

[Mike Lerman, 2015/03/19 19:27:30]

Changed to a pointer. Comment added.

+    base::MessageLoop::current()->RunUntilIdle();
+    return profile;
   }
 
   void CreateController() {