Convert SigninTracker to use OAuth2TokenService notifications

chrome/browser/signin/signin_tracker.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/signin/signin_tracker.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/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/signin/token_service.h"
-#include "chrome/browser/signin/token_service_factory.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_constants.h"
 
-static const char* kSignedInServices[] = {
-  GaiaConstants::kSyncService,
-  GaiaConstants::kGaiaOAuth2LoginRefreshToken
-};
-static const int kNumSignedInServices =
-    arraysize(kSignedInServices);
-
-// Helper to check if the given token service is relevant for sync.
 SigninTracker::SigninTracker(Profile* profile, Observer* observer)
     : state_(WAITING_FOR_GAIA_VALIDATION),
       profile_(profile),
       observer_(observer),
       credentials_valid_(false) {
+  DCHECK(profile_);
   Initialize();

[Andrew T Wilson (Slow), 2013/08/19 15:23:06]

I'm guessing it's an error to call this if the OAuth2TokenServiceFactory already
has a refresh token (since OnRefreshTokenAvailable() would never be fired) -
should we DCHECK() this?

 }
 
 SigninTracker::~SigninTracker() {
+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
+      RemoveObserver(this);
 }
 
 void SigninTracker::Initialize() {
   DCHECK(observer_);
   // Register for notifications from the SigninManager.
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
                  content::Source<Profile>(profile_));
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                  content::Source<Profile>(profile_));
-  TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_TOKEN_AVAILABLE,
-                 content::Source<TokenService>(token_service));
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
-                 content::Source<TokenService>(token_service));
 
-  if (state_ == SERVICES_INITIALIZING)
-    HandleServiceStateChange();

[Andrew T Wilson (Slow), 2013/08/19 15:23:06]

I guess we no longer support initializing in an intermediate state and this was
obsolete?

[Roger Tawa OOO till Jul 10th, 2013/08/29 19:28:41]

I noticed this was true while making this change.  Initialize() is called only
from ctor, and ctor always sets state_ to (WAITING_FOR_GAIA_VALIDATION.  So this
was dead code even before my CL.

+  ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->AddObserver(this);
 }
 
 void SigninTracker::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
   // We should not get more than one of these notifications.
   switch (type) {
     case chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL:
       DCHECK_EQ(state_, WAITING_FOR_GAIA_VALIDATION);
       state_ = SERVICES_INITIALIZING;
       // If our services are already signed in, see if it's possible to
       // transition to the SIGNIN_COMPLETE state.
       HandleServiceStateChange();
       break;
     case chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED: {
       DCHECK_EQ(state_, WAITING_FOR_GAIA_VALIDATION);
       const GoogleServiceAuthError& error =
           *(content::Details<const GoogleServiceAuthError>(details).ptr());
       observer_->SigninFailed(error);
       break;
     }
-    case chrome::NOTIFICATION_TOKEN_AVAILABLE:
-      // A new token is available - check to see if we're all signed in now.
-      HandleServiceStateChange();
-      break;
-    case chrome::NOTIFICATION_TOKEN_REQUEST_FAILED:
-      if (state_ == SERVICES_INITIALIZING) {
-        const TokenService::TokenRequestFailedDetails& token_details =
-            *(content::Details<const TokenService::TokenRequestFailedDetails>(
-                details).ptr());
-        for (int i = 0; i < kNumSignedInServices; ++i) {
-          if (token_details.service() == kSignedInServices[i]) {
-            // We got an error loading one of our tokens, so notify our
-            // observer.
-            state_ = WAITING_FOR_GAIA_VALIDATION;
-            observer_->SigninFailed(token_details.error());
-          }
-        }
-      }
-      break;
     default:
-      NOTREACHED();
+      NOTREACHED() << "Invalid type=" << type;
   }
 }
 
+void SigninTracker::OnRefreshTokenAvailable(const std::string& account_id) {
+  HandleServiceStateChange();
+}
+
+void SigninTracker::OnRefreshTokenRevoked(const std::string& account_id,
+                                          const GoogleServiceAuthError& error) {
+  if (state_ == SERVICES_INITIALIZING) {
+    // We got an error loading one of our tokens, so notify our observer.
+    state_ = WAITING_FOR_GAIA_VALIDATION;
+    observer_->SigninFailed(error);
+  }
+}
+
 void SigninTracker::HandleServiceStateChange() {
   if (state_ != SERVICES_INITIALIZING) {
     // Ignore service updates until after our GAIA credentials are validated.
     return;
   }
 
   GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
   state_ = GetSigninState(profile_, &error);
   switch (state_) {
     case WAITING_FOR_GAIA_VALIDATION:
       observer_->SigninFailed(error);
       break;
     case SIGNIN_COMPLETE:
       observer_->SigninSuccess();
       break;
     default:
       // State has not changed, nothing to do.
       DCHECK_EQ(state_, SERVICES_INITIALIZING);
       break;
   }
 }
 
 // static
 bool SigninTracker::AreServiceTokensLoaded(Profile* profile) {
-  // See if we have all of the tokens required.
-  TokenService* token_service = TokenServiceFactory::GetForProfile(profile);
-  for (int i = 0; i < kNumSignedInServices; ++i) {
-    if (!token_service->HasTokenForService(kSignedInServices[i])) {
-      // Don't have a token for one of our signed-in services.
-      return false;
-    }
-  }
-  return true;
+  return ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
+      RefreshTokenIsAvailable();
 }
 
 // static
 SigninTracker::LoginState SigninTracker::GetSigninState(
     Profile* profile,
     GoogleServiceAuthError* error) {
   SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
   if (signin->GetAuthenticatedUsername().empty()) {
     // User is signed out, trigger a signin failure.
     if (error)
       *error = GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED);
     return WAITING_FOR_GAIA_VALIDATION;
   }
 
   // If we haven't loaded all our service tokens yet, just exit (we'll be called
   // again when another token is loaded, or will transition to SigninFailed if
   // the loading fails).
   if (!AreServiceTokensLoaded(profile))
     return SERVICES_INITIALIZING;
 
   return SIGNIN_COMPLETE;
 }