Integrate OAuth2 login token generation into TokenService:

chrome/browser/net/gaia/token_service.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.
 //
 // The TokenService will supply authentication tokens for any service that
 // needs it, such as sync. Whenever the user logs in, a controller watching
 // the token service is expected either to call ClientLogin to derive a new
 // SID and LSID, or to use GAIA OAuth requests to derive an OAuth1 access
 // token for the OAuthLogin scope.  Whenever such credentials are available,
 // the TokenService should be updated with new credentials.  The controller
@@ skipping 33 matching lines @@
 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
+class TokenServiceTest;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // The TokenService is a Profile member, so all calls are expected
 // from the UI thread.
 class TokenService : public GaiaAuthConsumer,
                      public GaiaOAuthConsumer,
                      public WebDataServiceConsumer,
@@ skipping 83 matching lines @@
   // Results come back via event channel. Services can also poll before events
   // are issued.
   void StartFetchingTokens();
   // Fetch tokens for only those services for which we are missing tokens.
   // This can happen when new services are added in new Chrome versions and the
   // user is already logged in.
   void StartFetchingMissingTokens();
   void StartFetchingOAuthTokens();
   virtual bool HasTokenForService(const char* service) const;
   const std::string& GetTokenForService(const char* const service) const;
+  virtual bool HasOAuthLoginToken() const;

[Rick Campbell, 2011/11/28 22:51:07]

I think that these should not be singled out for special access, but rather,
users of this class can call HasTokenForService and/or GetTokenForService with
the service identifier as they do for other services.

[Munjal (Google), 2011/11/28 23:41:14]

These methods are more like OAuth1 methods and less like client login tokens for
each service.

Also, methods and code to create/store tokens for other OAuth scopes are not
added yet.

+  const std::string& GetOAuth2LoginRefreshToken() const;
+  const std::string& GetOAuth2LoginAccessToken() const;
 
   // For tests only. Doesn't save to the WebDB.
   void IssueAuthTokenForTest(const std::string& service,
                              const std::string& auth_token);
 
   // GaiaAuthConsumer implementation.
   virtual void OnIssueAuthTokenSuccess(const std::string& service,
                                        const std::string& auth_token) OVERRIDE;
   virtual void OnIssueAuthTokenFailure(
       const std::string& service,
       const GoogleServiceAuthError& error) OVERRIDE;
+  virtual void OnOAuthLoginTokenSuccess(const std::string& refresh_token,
+                                        const std::string& access_token,
+                                        int expires_in_secs) OVERRIDE;
+  virtual void OnOAuthLoginTokenFailure(const GoogleServiceAuthError& error)
+      OVERRIDE;
 
   // GaiaOAuthConsumer implementation.
   virtual void OnOAuthGetAccessTokenSuccess(const std::string& token,
                                             const std::string& secret) OVERRIDE;
   virtual void OnOAuthGetAccessTokenFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
   virtual void OnOAuthWrapBridgeSuccess(const std::string& service_scope,
                                         const std::string& token,
                                         const std::string& expires_in) OVERRIDE;
@@ skipping 12 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
 
   void FireTokenAvailableNotification(const std::string& service,
                                       const std::string& auth_token);
 
   void FireTokenRequestFailedNotification(const std::string& service,
                                           const GoogleServiceAuthError& error);
 
-  void LoadTokensIntoMemory(const std::map<std::string, std::string>& in_toks,
-                            std::map<std::string, std::string>* out_toks);
+  void LoadTokensIntoMemory(
+      const std::map<std::string, std::string>& db_tokens,
+      std::map<std::string, std::string>* in_memory_tokens);
+  void LoadSingleTokenIntoMemory(
+      const std::map<std::string, std::string>& db_tokens,
+      std::map<std::string, std::string>* in_memory_tokens,
+      const std::string& service);
 
   void SaveAuthTokenToDB(const std::string& service,
                          const std::string& auth_token);
 
+  // Returns the index of the given service.
+  static int GetServiceIndex(const std::string& service);
+
   // The profile with which this instance was initialized, or NULL.
   Profile* profile_;
 
   // Web data service to access tokens from.
   scoped_refptr<WebDataService> web_data_service_;
   // Getter to use for fetchers.
   scoped_refptr<net::URLRequestContextGetter> getter_;
   // Request handle to load Gaia tokens from DB.
   WebDataService::Handle token_loading_query_;
 
@@ skipping 29 matching lines @@
   static const char* kOAuthServices[kNumOAuthServices];
   // A bunch of fetchers suitable for OAuth token issuing. We don't care about
   // the ordering, nor do we care which is for which service.
   scoped_ptr<GaiaOAuthFetcher> oauth_fetchers_[kNumOAuthServices];
 
   // Map from service to token.
   std::map<std::string, std::string> token_map_;
 
   content::NotificationRegistrar registrar_;
 
+  friend class TokenServiceTest;
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryBasic);
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryAdvanced);
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, FullIntegrationNewServicesAdded);
 
   DISALLOW_COPY_AND_ASSIGN(TokenService);
 };
 
 #endif  // CHROME_BROWSER_NET_GAIA_TOKEN_SERVICE_H_