Change default code flag to NewAvatarMenu.

chrome/browser/notifications/message_center_settings_controller_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
@@ skipping 22 matching lines @@
   ~MessageCenterSettingsControllerBaseTest() override{};
 
   base::FilePath GetProfilePath(const std::string& base_name) {
     return testing_profile_manager_.profile_manager()->user_data_dir()
         .AppendASCII(base_name);
   }
 
   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() {
     controller_.reset(new MessageCenterSettingsController(
         testing_profile_manager_.profile_info_cache()));
   }
 
   void ResetController() {
     controller_.reset();
   }
@@ skipping 196 matching lines @@
   EXPECT_EQ(3u, notifiers.size());
   EXPECT_EQ(ash::system_notifier::kNotifierScreenshot,
             notifiers[2]->notifier_id.id);
 #endif
 
   EXPECT_EQ(kBarId, notifiers[0]->notifier_id.id);
   EXPECT_EQ(kFooId, notifiers[1]->notifier_id.id);
 
   STLDeleteElements(&notifiers);
 }