Merge 176800

chrome/browser/signin/token_service.h

 // Copyright (c) 2012 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 125 matching lines @@
 
   // Clear all DB stored tokens for the current profile. Tokens may still be
   // available in memory. If a DB load is pending it may still be serviced.
   void EraseTokensFromDB();
 
   // Returns true if tokens have been loaded from the DB. Set when
   // LoadTokensFromDB() completes, unset when ResetCredentialsInMemory() is
   // called.
   bool TokensLoadedFromDB() const;
 
-  // Returns true if the token service has all credentials needed to fetch
-  // tokens.
+  // Returns true if the token service has either GAIA credentials or OAuth2
+  // tokens needed to fetch other service tokens.
   virtual bool AreCredentialsValid() const;
 
   // Tokens will be fetched for all services(sync, talk) in the background.
   // Results come back via event channel. Services can also poll before events
   // are issued.
   void StartFetchingTokens();
   virtual bool HasTokenForService(const char* service) const;
   const std::string& GetTokenForService(const char* const service) const;
 
   // OAuth login token is an all-powerful token that allows creating OAuth2
   // tokens for any other scope (i.e. down-scoping).
   // Typical use is to create an OAuth2 token for appropriate scope and then
   // use that token to call a Google API.
   virtual bool HasOAuthLoginToken() const;
+  virtual bool HasOAuthLoginAccessToken() const;
   virtual 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 OnClientOAuthSuccess(const ClientOAuthResult& result) OVERRIDE;
   virtual void OnClientOAuthFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
   // WebDataServiceConsumer implementation.
   virtual void OnWebDataServiceRequestDone(
       WebDataService::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
  protected:
+  // Saves OAuth2 credentials.
+  void SaveOAuth2Credentials(const ClientOAuthResult& result);
+
   void set_tokens_loaded(bool loaded) {
     tokens_loaded_ = loaded;
   }
 
  private:
 
   // Gets the list of all service names for which tokens will be retrieved.
   // This method is meant only for tests.
   static void GetServiceNamesForTesting(std::vector<std::string>* names);
 
@@ skipping 46 matching lines @@
 
   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_SIGNIN_TOKEN_SERVICE_H_