Move SigninAccountIdHelper away from listening to Signin notifications

chrome/browser/signin/signin_account_id_helper.cc

 // Copyright 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/signin/signin_account_id_helper.h"
 
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_manager.h"
 #include "chrome/common/pref_names.h"
-#include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 
 // TODO(guohui): this class should be moved to a more generic place for reuse.
 class SigninAccountIdHelper::GaiaIdFetcher
     : public OAuth2TokenService::Consumer,
       public gaia::GaiaOAuthClient::Delegate {
  public:
   GaiaIdFetcher(SigninManagerBase* signin_manager,
                 SigninAccountIdHelper* signin_account_id_helper);
   virtual ~GaiaIdFetcher();
@@ skipping 75 matching lines @@
 }
 
 void SigninAccountIdHelper::GaiaIdFetcher::OnNetworkError(
     int response_code) {
   VLOG(1) << "OnNetworkError " << response_code;
 }
 
 SigninAccountIdHelper::SigninAccountIdHelper(SigninManagerBase* signin_manager)
     : signin_manager_(signin_manager) {
   DCHECK(signin_manager_);
-  registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
-                 content::Source<Profile>(signin_manager_->profile()));
-
+  signin_manager_->AddObserver(this);
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(
           signin_manager_->profile());
   std::string primary_email = signin_manager_->GetAuthenticatedAccountId();
   if (!primary_email.empty() &&
       token_service->RefreshTokenIsAvailable(primary_email) &&
       !disable_for_test_) {
     id_fetcher_.reset(new GaiaIdFetcher(signin_manager_, this));
   }
   token_service->AddObserver(this);
 }
 
 SigninAccountIdHelper::~SigninAccountIdHelper() {
+  signin_manager_->RemoveObserver(this);
   ProfileOAuth2TokenServiceFactory::GetForProfile(signin_manager_->profile())->
       RemoveObserver(this);
 }
 
-void SigninAccountIdHelper::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_GOOGLE_SIGNED_OUT) {
-    signin_manager_->profile()->GetPrefs()->
-        ClearPref(prefs::kGoogleServicesUserAccountId);
-  }
+void SigninAccountIdHelper::GoogleSignedOut(const std::string& username) {
+  signin_manager_->profile()->GetPrefs()->ClearPref(
+      prefs::kGoogleServicesUserAccountId);
 }
 
 void SigninAccountIdHelper::OnRefreshTokenAvailable(
     const std::string& account_id) {
   if (account_id == signin_manager_->GetAuthenticatedAccountId()) {
     std::string current_gaia_id =
       signin_manager_->profile()->GetPrefs()->
           GetString(prefs::kGoogleServicesUserAccountId);
     if (current_gaia_id.empty() && !disable_for_test_) {
       id_fetcher_.reset(new GaiaIdFetcher(signin_manager_, this));
@@ skipping 10 matching lines @@
 }
 
 // static
 bool SigninAccountIdHelper::disable_for_test_ = false;
 
 // static
 void SigninAccountIdHelper::SetDisableForTest(bool disable_for_test) {
   disable_for_test_ = disable_for_test;
 }