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

chrome/browser/net/gaia/gaia_oauth_fetcher.h

Index: chrome/browser/net/gaia/gaia_oauth_fetcher.h
===================================================================
--- chrome/browser/net/gaia/gaia_oauth_fetcher.h	(revision 105158)
+++ chrome/browser/net/gaia/gaia_oauth_fetcher.h	(working copy)
@@ -106,15 +106,6 @@
   // 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,
@@ -167,11 +158,6 @@
                                         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,
@@ -228,6 +214,9 @@
       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_,