Split token-related methods from WebDataService

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 34 matching lines @@
 #define CHROME_BROWSER_SIGNIN_TOKEN_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/signin/signin_internals_util.h"
-#include "chrome/browser/webdata/web_data_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
+#include "components/webdata/common/web_data_service_base.h"
+#include "components/webdata/common/web_data_service_consumer.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 class Profile;
 class TokenServiceTest;
+class TokenWebData;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // The TokenService is a Profile member, so all calls are expected
 // from the UI thread.
 class TokenService : public GaiaAuthConsumer,
                      public BrowserContextKeyedService,
                      public WebDataServiceConsumer {
@@ skipping 108 matching lines @@
                                        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,
+      WebDataServiceBase::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
   // Gets the list of all service names for which tokens will be retrieved.
   static void GetServiceNames(std::vector<std::string>* names);
 
  protected:
   // Saves OAuth2 credentials.
   void SaveOAuth2Credentials(const ClientOAuthResult& result);
 
   void set_tokens_loaded(bool loaded) {
@@ skipping 18 matching lines @@
   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_;
+  scoped_refptr<TokenWebData> token_web_data_;
   // Getter to use for fetchers.
   scoped_refptr<net::URLRequestContextGetter> getter_;
   // Request handle to load Gaia tokens from DB.
-  WebDataService::Handle token_loading_query_;
+  WebDataServiceBase::Handle token_loading_query_;
   // True if token loading has completed (regardless of success).
   bool tokens_loaded_;
 
   // Gaia request source for Gaia accounting.
   std::string source_;
   // Credentials from ClientLogin for Issuing auth tokens.
   GaiaAuthConsumer::ClientLoginResult credentials_;
 
   // A bunch of fetchers suitable for ClientLogin token issuing. We don't care
   // about the ordering, nor do we care which is for which service.  The
@@ skipping 11 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_