Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/ui/views/frame/browser_non_client_frame_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 
-#include "chrome/browser/profiles/profile_info_cache_observer.h"
+#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "ui/views/window/non_client_view.h"
 
 class AvatarMenuButton;
 class BrowserFrame;
 class BrowserView;
 
 // A specialization of the NonClientFrameView object that provides additional
 // Browser-specific methods.
 class BrowserNonClientFrameView : public views::NonClientFrameView,
-                                  public ProfileInfoCacheObserver {
+                                  public ProfileAttributesStorage::Observer {
  public:
   BrowserNonClientFrameView(BrowserFrame* frame, BrowserView* browser_view);
   ~BrowserNonClientFrameView() override;
 
   BrowserView* browser_view() const { return browser_view_; }
   BrowserFrame* frame() const { return frame_; }
   AvatarMenuButton* avatar_button() const { return avatar_button_; }
 
   // Called when BrowserView creates all it's child views.
   virtual void OnBrowserViewInitViewsComplete();
@@ skipping 43 matching lines @@
 #endif
 
   // Update the profile switcher button if one should exist. Otherwise, update
   // the incognito avatar, or profile avatar for teleported frames in ChromeOS.
   virtual void UpdateAvatar() = 0;
 
   // Updates the title and icon of the old avatar button.
   void UpdateOldAvatarButton();
 
  private:
-  // Overriden from ProfileInfoCacheObserver.
+  // Overriden from ProfileAttributesStorage::Observer.
   void OnProfileAdded(const base::FilePath& profile_path) override;
   void OnProfileWasRemoved(const base::FilePath& profile_path,
                            const base::string16& profile_name) override;
   void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
 
   // Draws a taskbar icon if avatars are enabled, erases it otherwise.
   void UpdateTaskbarDecoration();
 
   // The frame that hosts this view.
   BrowserFrame* frame_;
 
   // The BrowserView hosted within this View.
   BrowserView* browser_view_;
 
   // Menu button that displays the incognito icon. May be null for some frame
   // styles. TODO(anthonyvd): simplify/rename.
-  AvatarMenuButton* avatar_button_;
+  AvatarMenuButton* avatar_button_ = nullptr;
 };
 
 namespace chrome {
 
 // Provided by a browser_non_client_frame_view_factory_*.cc implementation
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame, BrowserView* browser_view);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_