[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/ui/webui/options/manage_profile_handler.cc

 // Copyright (c) 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 "chrome/browser/ui/webui/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 110 matching lines @@
 
   localized_strings->SetBoolean("newAvatarMenuEnabled",
                                 switches::IsNewAvatarMenu());
   localized_strings->SetBoolean("profileShortcutsEnabled",
                                 ProfileShortcutManager::IsFeatureEnabled());
 
   GenerateSignedinUserSpecificStrings(localized_strings);
 }
 
 void ManageProfileHandler::InitializeHandler() {
-  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-                 content::NotificationService::AllSources());
+  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
 
   Profile* profile = Profile::FromWebUI(web_ui());
   pref_change_registrar_.Init(profile->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kSupervisedUserCreationAllowed,
       base::Bind(&ManageProfileHandler::OnCreateSupervisedUserPrefChange,
                  base::Unretained(this)));
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   // Sync may be disabled for tests.
@@ skipping 39 matching lines @@
   web_ui()->RegisterMessageCallback("refreshGaiaPicture",
       base::Bind(&ManageProfileHandler::RefreshGaiaPicture,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "showDisconnectManagedProfileDialog",
       base::Bind(&ManageProfileHandler::ShowDisconnectManagedProfileDialog,
                  base::Unretained(this)));
 }
 
 void ManageProfileHandler::Uninitialize() {
-  registrar_.RemoveAll();
+  g_browser_process->profile_manager()->
+      GetProfileInfoCache().RemoveObserver(this);
 }
 
-void ManageProfileHandler::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED) {
-    SendExistingProfileNames();
-    base::StringValue value(kManageProfileIdentifier);
-    SendProfileIconsAndNames(value);
-  }
+void ManageProfileHandler::OnProfileAdded(const base::FilePath& profile_path) {
+  SendExistingProfileNames();
+}
+
+void ManageProfileHandler::OnProfileWasRemoved(
+    const base::FilePath& profile_path,
+    const base::string16& profile_name) {
+  SendExistingProfileNames();
+}
+
+void ManageProfileHandler::OnProfileNameChanged(
+    const base::FilePath& profile_path,
+    const base::string16& old_profile_name) {
+  base::StringValue value(kManageProfileIdentifier);
+  SendProfileIconsAndNames(value);
+}
+
+void ManageProfileHandler::OnProfileAvatarChanged(
+    const base::FilePath& profile_path) {
+  base::StringValue value(kManageProfileIdentifier);
+  SendProfileIconsAndNames(value);
 }
 
 void ManageProfileHandler::OnStateChanged() {
   RequestCreateProfileUpdate(NULL);
 }
 
 void ManageProfileHandler::GenerateSignedinUserSpecificStrings(
     base::DictionaryValue* dictionary) {
   std::string username;
   std::string domain_name;
@@ skipping 323 matching lines @@
 
   // Update the UI buttons.
   OnHasProfileShortcuts(false);
 }
 
 void ManageProfileHandler::RefreshGaiaPicture(const base::ListValue* args) {
   profiles::UpdateGaiaProfileInfoIfNeeded(Profile::FromWebUI(web_ui()));
 }
 
 }  // namespace options