Revert 105151 - Merge 103908 - Extend GaiaOAuthFetcher with support for revoking tokens.

chrome/browser/net/gaia/gaia_oauth_fetcher.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_NET_GAIA_GAIA_OAUTH_FETCHER_H_
 #define CHROME_BROWSER_NET_GAIA_GAIA_OAUTH_FETCHER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 88 matching lines @@
       const std::string& oauth1_access_token,
       const std::string& oauth1_access_token_secret,
       const std::string& wrap_token_duration,
       const std::string& service_scope);
 
   // Obtains user information related to an OAuth2 access token
   //
   // oauth2_access_token is from OAuthWrapBridge's result.
   virtual void StartUserInfo(const std::string& oauth2_access_token);
 
-  // Starts a request for revoking the given OAuth access token (as requested by
-  // StartOAuthGetAccessToken).
-  virtual void StartOAuthRevokeAccessToken(const std::string& token,
-                                           const std::string& secret);
-
-  // Starts a request for revoking the given OAuth Bearer token (as requested by
-  // StartOAuthWrapBridge).
-  virtual void StartOAuthRevokeWrapToken(const std::string& token);
-
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // Called when a cookie, e. g. oauth_token, changes
   virtual void OnCookieChanged(Profile* profile,
                                ChromeCookieDetails* cookie_details);
 
   // Called when a cookie, e. g. oauth_token, changes
@@ skipping 32 matching lines @@
   // Process the results of a OAuthGetAccessToken fetch.
   virtual void OnOAuthGetAccessTokenFetched(const std::string& data,
                                             const net::URLRequestStatus& status,
                                             int response_code);
 
   // Process the results of a OAuthWrapBridge fetch.
   virtual void OnOAuthWrapBridgeFetched(const std::string& data,
                                         const net::URLRequestStatus& status,
                                         int response_code);
 
-  // Process the results of a token revocation fetch.
-  virtual void OnOAuthRevokeTokenFetched(const std::string& data,
-                                         const net::URLRequestStatus& status,
-                                         int response_code);
-
   // Process the results of a userinfo fetch.
   virtual void OnUserInfoFetched(const std::string& data,
                                  const net::URLRequestStatus& status,
                                  int response_code);
 
   // Tokenize the results of a GetOAuthToken fetch.
   static void ParseGetOAuthTokenResponse(const std::string& data,
                                          std::string* token);
 
   // Tokenize the results of a OAuthLogin fetch.
@@ skipping 36 matching lines @@
       const std::string& oauth1_access_token,
       const std::string& oauth1_access_token_secret);
 
   // Given parameters, create a OAuthWrapBridge request body.
   static std::string MakeOAuthWrapBridgeBody(
       const std::string& oauth1_access_token,
       const std::string& oauth1_access_token_secret,
       const std::string& wrap_token_duration,
       const std::string& oauth2_service_scope);
 
+  // Given parameters, create a userinfo request body.
+  static std::string MakeUserInfoBody(const std::string& oauth2_access_token);
+
   // Create a fetcher useable for making any Gaia OAuth request.
   static URLFetcher* CreateGaiaFetcher(net::URLRequestContextGetter* getter,
                                        const GURL& gaia_gurl_,
                                        const std::string& body,
                                        const std::string& headers,
                                        bool send_cookies,
                                        URLFetcher::Delegate* delegate);
 
   bool ShouldAutoFetch(AutoFetchLimit fetch_step);
 
   // These fields are common to GaiaOAuthFetcher, same every request
   GaiaOAuthConsumer* const consumer_;
   net::URLRequestContextGetter* const getter_;
   Profile* profile_;
   Browser* popup_;
   NotificationRegistrar registrar_;
 
   // While a fetch is going on:
   scoped_ptr<URLFetcher> fetcher_;
   std::string request_body_;
   std::string request_headers_;
   std::string service_scope_;
   bool fetch_pending_;
   AutoFetchLimit auto_fetch_limit_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaOAuthFetcher);
 };
 
 #endif  // CHROME_BROWSER_NET_GAIA_GAIA_OAUTH_FETCHER_H_