Convert SigninTracker to use OAuth2TokenService notifications

chrome/browser/signin/signin_tracker.cc

Index: chrome/browser/signin/signin_tracker.cc
diff --git a/chrome/browser/signin/signin_tracker.cc b/chrome/browser/signin/signin_tracker.cc
index b356efb3318b90e24204555a7b26b0e9a9232e4d..7dcfd482806652f429472ce020f1e7c67b971d86 100644
--- a/chrome/browser/signin/signin_tracker.cc
+++ b/chrome/browser/signin/signin_tracker.cc
@@ -6,149 +6,70 @@
 
 #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);
+// Returns true if the tokens are loaded for all signed-in services.
+static bool AreServiceTokensLoaded(Profile* profile) {
+  // SigninTracker only tracks the primary account, so only need to check
+  // that one.
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+
+  return token_service->RefreshTokenIsAvailable() &&
+      token_service->GetAuthStatus().state() == GoogleServiceAuthError::NONE;
+}
+
 
-// 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) {
+    : profile_(profile), observer_(observer) {
+  DCHECK(profile_);
   Initialize();
 }
 
 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();
+  OAuth2TokenService* token_service =
+    ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
+  token_service->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();
-  }
-}
-
-void SigninTracker::HandleServiceStateChange() {
-  if (state_ != SERVICES_INITIALIZING) {
-    // Ignore service updates until after our GAIA credentials are validated.
-    return;
-  }
+  DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED, type);
 
-  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;
-  }
+  // We should not get more than one of these notifications.
+  const GoogleServiceAuthError& error =
+      *(content::Details<const GoogleServiceAuthError>(details).ptr());
+  observer_->SigninFailed(error);
 }
 
-// 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;
+void SigninTracker::OnRefreshTokenAvailable(const std::string& account_id) {
+  // TODO: when OAuth2TokenService handles multi-login, this should check
+  // that |account_id| is the primary account before signalling success.
+  observer_->SigninSuccess();
 }
 
-// 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;
+void SigninTracker::OnRefreshTokenRevoked(const std::string& account_id) {
+  // TODO: when OAuth2TokenService handles multi-login, this should check
+  // that |account_id| is the primary account before signalling failure.
+  observer_->SigninFailed(
+      GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED));

[Andrew T Wilson (Slow), 2013/09/09 12:08:27]

Can we document under what circumstance OnRefreshTokenRevoked() is invoked
during a signin?

[Roger Tawa OOO till Jul 10th, 2013/09/10 14:29:23]

Good catch.  While writing the unit tests I realized this would not be called,
but forgot to change it.  Replaced with NOTREACHED.

 }