Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6492)

Unified Diff: chrome/browser/notifications/message_center_settings_controller_unittest.cc

Issue 845373002: Change default code flag to NewAvatarMenu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Linux compile Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
+ // 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() {

Powered by Google App Engine
This is Rietveld 408576698