Move RevokeCredentialsOnServer to MutableProfileOAuth2TokenService

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"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/url_request/url_request_context_getter.h"
 
-namespace {
-
-// This class sends a request to GAIA to revoke the given refresh token from
-// the server.  This is a best effort attempt only.  This class deletes itself
-// when done sucessfully or otherwise.
-class RevokeServerRefreshToken : public GaiaAuthConsumer {
- public:
-  RevokeServerRefreshToken(const std::string& account_id,
-                           net::URLRequestContextGetter* request_context);
-  virtual ~RevokeServerRefreshToken();
-
- private:
-  // GaiaAuthConsumer overrides:
-  virtual void OnOAuth2RevokeTokenCompleted() OVERRIDE;
-
-  scoped_refptr<net::URLRequestContextGetter> request_context_;
-  scoped_ptr<GaiaAuthFetcher> fetcher_;
-
-  DISALLOW_COPY_AND_ASSIGN(RevokeServerRefreshToken);
-};
-
-RevokeServerRefreshToken::RevokeServerRefreshToken(
-    const std::string& refresh_token,
-    net::URLRequestContextGetter* request_context)
-    : request_context_(request_context) {
-  fetcher_.reset(
-      new GaiaAuthFetcher(this,
-                          GaiaConstants::kChromeSource,
-                          request_context_.get()));
-  fetcher_->StartRevokeOAuth2Token(refresh_token);
-}
-
-RevokeServerRefreshToken::~RevokeServerRefreshToken() {}
-
-void RevokeServerRefreshToken::OnOAuth2RevokeTokenCompleted() {
-  delete this;
-}
-
-}  // namespace
-
-
 ProfileOAuth2TokenService::AccountInfo::AccountInfo(
     ProfileOAuth2TokenService* token_service,
     const std::string& account_id,
     const std::string& refresh_token)
   : token_service_(token_service),
     account_id_(account_id),
     refresh_token_(refresh_token),
     last_auth_error_(GoogleServiceAuthError::NONE) {
   DCHECK(token_service_);
   DCHECK(!account_id_.empty());
@@ skipping 52 matching lines @@
 
 std::string ProfileOAuth2TokenService::GetRefreshToken(
     const std::string& account_id) {
   AccountInfoMap::const_iterator iter = refresh_tokens_.find(account_id);
   if (iter != refresh_tokens_.end())
     return iter->second->refresh_token();
   return std::string();
 }
 
 net::URLRequestContextGetter* ProfileOAuth2TokenService::GetRequestContext() {
-  return profile_->GetRequestContext();
+  return NULL;
 }
 
 void ProfileOAuth2TokenService::UpdateAuthError(
     const std::string& account_id,
     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 ||
       error.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE)
@@ skipping 104 matching lines @@
 
   // TODO(fgorski): Notify diagnostic observers.
 }
 
 void ProfileOAuth2TokenService::LoadCredentials() {
   // Empty implementation by default.
 }
 
 void ProfileOAuth2TokenService::RevokeCredentialsOnServer(
     const std::string& refresh_token) {
-  // RevokeServerRefreshToken deletes itself when done.
-  new RevokeServerRefreshToken(refresh_token, GetRequestContext());
+  // Empty implementation by default.
 }