[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/ui/webui/ntp/ntp_login_handler.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/ui/webui/ntp/ntp_login_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_notifier.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/host_zoom_map.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/page_zoom.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 
@@ skipping 25 matching lines @@
   return base::ASCIIToUTF16("<span class='" + css_class + "'>") +
       net::EscapeForHTML(content) + base::ASCIIToUTF16("</span>");
 }
 
 }  // namespace
 
 NTPLoginHandler::NTPLoginHandler() {
 }
 
 NTPLoginHandler::~NTPLoginHandler() {
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  // The profile_manager might be NULL in testing environments.
+  if (profile_manager)
+    profile_manager->GetProfileInfoCache().RemoveObserver(this);
 }
 
 void NTPLoginHandler::RegisterMessages() {
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  // The profile_manager might be NULL in testing environments.
+  if (profile_manager)
+    profile_manager->GetProfileInfoCache().AddObserver(this);
+
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   signin_allowed_pref_.Init(prefs::kSigninAllowed,
                             pref_service,
                             base::Bind(&NTPLoginHandler::UpdateLogin,
                                        base::Unretained(this)));
 
-  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-                 content::NotificationService::AllSources());
-
   web_ui()->RegisterMessageCallback("initializeSyncLogin",
       base::Bind(&NTPLoginHandler::HandleInitializeSyncLogin,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("showSyncLoginUI",
       base::Bind(&NTPLoginHandler::HandleShowSyncLoginUI,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("loginMessageSeen",
       base::Bind(&NTPLoginHandler::HandleLoginMessageSeen,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("showAdvancedLoginUI",
       base::Bind(&NTPLoginHandler::HandleShowAdvancedLoginUI,
                  base::Unretained(this)));
 }
 
-void NTPLoginHandler::Observe(int type,
-                              const content::NotificationSource& source,
-                              const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, type);
+void NTPLoginHandler::OnProfileUserNameChanged(
+    const base::FilePath& profile_path) {
   UpdateLogin();
 }
 
 void NTPLoginHandler::HandleInitializeSyncLogin(const base::ListValue* args) {
   UpdateLogin();
 }
 
 void NTPLoginHandler::HandleShowSyncLoginUI(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   if (!signin::ShouldShowPromo(profile))
@@ skipping 127 matching lines @@
   values->SetString("login_status_message", message);
   values->SetString("login_status_url",
       hide_sync ? std::string() : chrome::kSyncLearnMoreURL);
   values->SetString("login_status_advanced",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_ADVANCED));
   values->SetString("login_status_dismiss",
       hide_sync ? base::string16() :
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_NTP_BUBBLE_OK));
 }