Added OAuth support to TokenService

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 35 matching lines @@
     OAUTH1_REQUEST_TOKEN,
     OAUTH1_ALL_ACCESS_TOKEN,
     OAUTH2_SERVICE_ACCESS_TOKEN,
     USER_INFO,
     ALL_OAUTH_STEPS,
   } AutoFetchLimit;
 
   GaiaOAuthFetcher(GaiaOAuthConsumer* consumer,
                    net::URLRequestContextGetter* getter,
                    Profile* profile,
-                   const std::string& service_name,
                    const std::string& service_scope);
 
   virtual ~GaiaOAuthFetcher();
 
   // Sets the mask of which OAuth fetch steps should be automatically kicked
   // of upon successful completition of the previous steps. By default,
   // this class will chain all steps in OAuth proccess.
   void SetAutoFetchLimit(AutoFetchLimit limit) { auto_fetch_limit_ = limit; }
 
   // Obtains an OAuth 1 request token
@@ skipping 19 matching lines @@
       const std::string& oauth1_request_token);
 
   // Obtains an OAuth2 access token using Gaia's OAuth1-to-OAuth2 bridge.
   //
   // oauth1_access_token and oauth1_access_token_secret are from
   // OAuthGetAccessToken's result.
   //
   // wrap_token_duration is typically one hour,
   // which is also the max -- you can only decrease it.
   //
-  // service_name and service_scope should be specific to a service.  For
-  // example, Chromium Sync uses https://www.googleapis.com/auth/chromesync as
-  // its OAuth2 service scope.
+  // service_scope will be used as a service name.  For example, Chromium Sync
+  // uses https://www.googleapis.com/auth/chromesync for its OAuth2 service
+  // scope here as well as for its service name in TokenService.
   virtual void StartOAuthWrapBridge(
       const std::string& oauth1_access_token,
       const std::string& oauth1_access_token_secret,
       const std::string& wrap_token_duration,
-      const std::string& service_name,
       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);
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
@@ skipping 119 matching lines @@
   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_name_;
   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_