Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/profiles/avatar_menu.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/avatar_menu.h"
 
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 22 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
 using content::BrowserThread;
 
-AvatarMenu::AvatarMenu(ProfileInfoInterface* profile_cache,
+AvatarMenu::AvatarMenu(ProfileAttributesStorage* /*profile_storage*/,

[lwchkg, 2016/02/14 17:07:18]

Currently only the interface of AvatarMenu refactored, and that's why this
variable is unused. The actual refactoring is too large to be included in this
CL, and I'll work on that later.

[lwchkg, 2016/02/14 17:22:37]

I've found another 5 Mac-only files calling this constructor. However, uploading
these files requires adding more reviewers. If the try-bots pass (which should)
without modifying these 5 files, I'll refactor these files in other CLs.

                        AvatarMenuObserver* observer,
                        Browser* browser)
-    : profile_list_(ProfileList::Create(profile_cache)),
+    : profile_list_(ProfileList::Create(
+          &g_browser_process->profile_manager()->GetProfileInfoCache())),
       menu_actions_(AvatarMenuActions::Create()),
 #if defined(ENABLE_SUPERVISED_USERS)
       supervised_user_observer_(this),
 #endif
-      profile_info_(profile_cache),
+      profile_info_(
+          &g_browser_process->profile_manager()->GetProfileInfoCache()),
       observer_(observer),
       browser_(browser) {
   DCHECK(profile_info_);
   // Don't DCHECK(browser_) so that unit tests can reuse this ctor.
 
   ActiveBrowserChanged(browser_);
 
   // Register this as an observer of the info cache.
   g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
 
@@ skipping 211 matching lines @@
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }
 #endif
 
 void AvatarMenu::Update() {
   RebuildMenu();
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }