Convert SigninTracker to use OAuth2TokenService notifications

chrome/browser/signin/profile_oauth2_token_service.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/profile_oauth2_token_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
@@ skipping 104 matching lines @@
     const GoogleServiceAuthError& error) {
   // Do not report connection errors as these are not actually auth errors.
   // We also want to avoid masking a "real" auth error just because we
   // subsequently get a transient network error.
   if (error.state() == GoogleServiceAuthError::CONNECTION_FAILED)
     return;
 
   if (error.state() != last_auth_error_.state()) {
     last_auth_error_ = error;
     signin_global_error_->AuthStatusChanged();
+
+    if (last_auth_error_.state() ==
+        GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS) {
+      RevokeCredentials(GetAccountId(profile_));

[Andrew T Wilson (Slow), 2013/08/30 09:03:33]

Still extremely nervous about this. Are you sure we want to do this? I'm
officially not participating in any code reds from 100% of our users getting
their oauth tokens revoked due to some buggy server push :-P

[Roger Tawa OOO till Jul 10th, 2013/08/30 15:55:40]

Yeah, me too.  Changed to no longe revoke and check last error in
RefreshTokenIsAvailable().

+    }
   }
 }
 
 void ProfileOAuth2TokenService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_TOKEN_AVAILABLE: {
       TokenService::TokenAvailableDetails* tok_details =
@@ skipping 102 matching lines @@
     CancelRequestsForToken(refresh_tokens_[account_id]);
     refresh_tokens_.erase(account_id);
     scoped_refptr<TokenWebData> token_web_data =
         TokenWebData::FromBrowserContext(profile_);
     if (token_web_data.get())
       token_web_data->RemoveTokenForService(ApplyAccountIdPrefix(account_id));
     FireRefreshTokenRevoked(account_id);
 
     // TODO(fgorski): Notify diagnostic observers.
   }
+
+  // Remove the token from TokenService if this corresponds to the connected
+  // account.
+  if (account_id == GetAccountId(profile_)) {
+    TokenService* token_service =
+        TokenServiceFactory::GetForProfile(profile_);
+    token_service->ClearOAuth2Credentials();
+    DCHECK(!token_service->HasOAuthLoginToken());
+  }
 }
 
 void ProfileOAuth2TokenService::RevokeAllCredentials() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   CancelAllRequests();
   for (std::map<std::string, std::string>::const_iterator iter =
            refresh_tokens_.begin();
        iter != refresh_tokens_.end();
        ++iter) {
@@ skipping 66 matching lines @@
     }
   }
 
   if (!old_login_token.empty() &&
       refresh_tokens_.count(GetAccountId(profile_)) == 0) {
     UpdateCredentials(GetAccountId(profile_), old_login_token);
   }
 
   FireRefreshTokensLoaded();
 }