[GCM] Handling connection events in GCMAccountTracker

chrome/browser/services/gcm/gcm_profile_service.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/services/gcm/gcm_profile_service.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 34 matching lines @@
  public:
   IdentityObserver(Profile* profile, GCMDriver* driver);
   virtual ~IdentityObserver();
 
   // IdentityProvider::Observer:
   virtual void OnActiveAccountLogin() OVERRIDE;
   virtual void OnActiveAccountLogout() OVERRIDE;
 
   std::string SignedInUserName() const;
 
-  // Called to inform IdentityObserver that a list of accounts was updated.
-  // |account_tokens| is a list of email addresses, account IDs and OAuth2
-  // access tokens.
-  void AccountsUpdated(
-      const std::vector<GCMClient::AccountTokenInfo>& account_tokens);
+ private:
+  void StartAccountTracker();
 
- private:
   Profile* profile_;
   GCMDriver* driver_;
   scoped_ptr<IdentityProvider> identity_provider_;
   scoped_ptr<GCMAccountTracker> gcm_account_tracker_;
 
   // The account ID that this service is responsible for. Empty when the service
   // is not running.
   std::string account_id_;
 
   base::WeakPtrFactory<GCMProfileService::IdentityObserver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IdentityObserver);
 };
 
 GCMProfileService::IdentityObserver::IdentityObserver(Profile* profile,
                                                       GCMDriver* driver)
     : profile_(profile), driver_(driver), weak_ptr_factory_(this) {
   identity_provider_.reset(new ProfileIdentityProvider(
       SigninManagerFactory::GetForProfile(profile),
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       LoginUIServiceFactory::GetForProfile(profile)));
   identity_provider_->AddObserver(this);
 
   OnActiveAccountLogin();
+  StartAccountTracker();
 }
 
 GCMProfileService::IdentityObserver::~IdentityObserver() {
   if (gcm_account_tracker_)
     gcm_account_tracker_->Shutdown();
   identity_provider_->RemoveObserver(this);
 }
 
 void GCMProfileService::IdentityObserver::OnActiveAccountLogin() {
   // This might be called multiple times when the password changes.
   const std::string account_id = identity_provider_->GetActiveAccountId();
   if (account_id == account_id_)
     return;
+
   account_id_ = account_id;
-
   driver_->OnSignedIn();
-
-  if (!gcm_account_tracker_) {
-    scoped_ptr<gaia::AccountTracker> gaia_account_tracker(
-        new gaia::AccountTracker(identity_provider_.get(),
-                                 profile_->GetRequestContext()));
-
-    gcm_account_tracker_.reset(new GCMAccountTracker(
-        gaia_account_tracker.Pass(),
-        base::Bind(&GCMProfileService::IdentityObserver::AccountsUpdated,
-                   weak_ptr_factory_.GetWeakPtr())));
-  }
-
-  gcm_account_tracker_->Start();
 }
 
 void GCMProfileService::IdentityObserver::OnActiveAccountLogout() {
   account_id_.clear();
 
-  // Check is necessary to not crash browser_tests.
-  if (gcm_account_tracker_)
-    gcm_account_tracker_->Stop();
   // When sign-in enforcement is not dropped, OnSignedOut will also clear all
   // the GCM data and a new GCM ID will be retrieved after the user signs in
   // again. Otherwise, the user sign-out will not affect the existing GCM
   // data.
   driver_->OnSignedOut();
 }
 
 std::string GCMProfileService::IdentityObserver::SignedInUserName() const {
   return driver_->IsStarted() ? account_id_ : std::string();
 }
 
-void GCMProfileService::IdentityObserver::AccountsUpdated(
-    const std::vector<GCMClient::AccountTokenInfo>& account_tokens) {
-  driver_->SetAccountTokens(account_tokens);
+void GCMProfileService::IdentityObserver::StartAccountTracker() {
+  if (gcm_account_tracker_)
+    return;
+
+  scoped_ptr<gaia::AccountTracker> gaia_account_tracker(
+      new gaia::AccountTracker(identity_provider_.get(),
+                               profile_->GetRequestContext()));
+
+  gcm_account_tracker_.reset(
+      new GCMAccountTracker(gaia_account_tracker.Pass(), driver_));
+
+  gcm_account_tracker_->Start();
 }
+
 #endif  // !defined(OS_ANDROID)
 
 // static
 bool GCMProfileService::IsGCMEnabled(Profile* profile) {
   return profile->GetPrefs()->GetBoolean(prefs::kGCMChannelEnabled);
 }
 
 // static
 void GCMProfileService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
@@ skipping 79 matching lines @@
 #if defined(OS_ANDROID)
   return std::string();
 #else
   return identity_observer_ ? identity_observer_->SignedInUserName()
                             : std::string();
 #endif  // defined(OS_ANDROID)
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
+  if (identity_observer_)
+    identity_observer_.reset(new IdentityObserver(profile_, driver));
 }
 
 }  // namespace gcm