[Profiles] Remove the NotificationService from the ProfileInfoCache

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 "ash/ash_switches.h"
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
@@ skipping 47 matching lines @@
 #endif
       profile_info_(profile_cache),
       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.
-  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-      content::NotificationService::AllSources());
+  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
 
 #if defined(ENABLE_SUPERVISED_USERS)
   // Register this as an observer of the SupervisedUserService to be notified
   // of changes to the custodian info.
   if (browser_) {
     supervised_user_observer_.Add(
         SupervisedUserServiceFactory::GetForProfile(browser_->profile()));
   }
 #endif
 }
 
 AvatarMenu::~AvatarMenu() {
+  g_browser_process->profile_manager()->
+      GetProfileInfoCache().RemoveObserver(this);
 }
 
 AvatarMenu::Item::Item(size_t menu_index,
                        size_t profile_index,
                        const gfx::Image& icon)
     : icon(icon),
       active(false),
       signed_in(false),
       signin_required(false),
       menu_index(menu_index),
@@ skipping 149 matching lines @@
 }
 
 bool AvatarMenu::ShouldShowAddNewProfileLink() const {
   return menu_actions_->ShouldShowAddNewProfileLink();
 }
 
 bool AvatarMenu::ShouldShowEditProfileLink() const {
   return menu_actions_->ShouldShowEditProfileLink();
 }
 
-void AvatarMenu::Observe(int type,
-                         const content::NotificationSource& source,
-                         const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, type);
-  RebuildMenu();
-  if (observer_)
-    observer_->OnAvatarMenuChanged(this);
+void AvatarMenu::OnProfileAdded(const base::FilePath& profile_path) {
+  Update();
+}
+
+void AvatarMenu::OnProfileWasRemoved(const base::FilePath& profile_path,
+                                     const base::string16& profile_name) {
+  Update();
+}
+
+void AvatarMenu::OnProfileNameChanged(const base::FilePath& profile_path,
+                                      const base::string16& old_profile_name) {
+  Update();
+}
+
+void AvatarMenu::OnProfileUserNameChanged(const base::FilePath& profile_path) {
+  Update();
+}
+
+void AvatarMenu::OnProfileAvatarChanged(const base::FilePath& profile_path) {
+  Update();
+}
+
+void AvatarMenu::OnProfileHighResAvatarLoaded(
+    const base::FilePath& profile_path) {
+  Update();
+}
+
+void AvatarMenu::OnProfileSigninRequiredChanged(
+    const base::FilePath& profile_path) {
+  Update();
 }
 
 #if defined(ENABLE_SUPERVISED_USERS)
 void AvatarMenu::OnCustodianInfoChanged() {
   RebuildMenu();
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }
 #endif
+
+void AvatarMenu::Update() {
+  RebuildMenu();
+  if (observer_)
+    observer_->OnAvatarMenuChanged(this);
+}