Refactor AO2TS to make it easier to componentize.

components/signin/core/browser/profile_oauth2_token_service.h

Index: components/signin/core/browser/profile_oauth2_token_service.h
diff --git a/components/signin/core/browser/profile_oauth2_token_service.h b/components/signin/core/browser/profile_oauth2_token_service.h
index c5a3c201ed72c036f8f19013df68ef2bd97feb70..3eb39267cda7c365ea3c17e8a33d85dc96db7861 100644
--- a/components/signin/core/browser/profile_oauth2_token_service.h
+++ b/components/signin/core/browser/profile_oauth2_token_service.h
@@ -11,6 +11,7 @@
 #include "base/memory/linked_ptr.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "google_apis/gaia/oauth2_token_service.h"
+#include "google_apis/gaia/oauth2_token_service_delegate.h"
 
 namespace net {
 class URLRequestContextGetter;
@@ -37,18 +38,12 @@ class SigninErrorController;
 class ProfileOAuth2TokenService : public OAuth2TokenService,
                                   public KeyedService {
  public:
+  ProfileOAuth2TokenService(OAuth2TokenServiceDelegate* delegate);
   ~ProfileOAuth2TokenService() override;
 
-  // Initializes this token service with the SigninClient.
-  virtual void Initialize(SigninClient* client,
-                          SigninErrorController* signin_error_controller);
-
   // KeyedService implementation.
   void Shutdown() override;
 
-  // Lists account IDs of all accounts with a refresh token.
-  std::vector<std::string> GetAccounts() override;
-
   // Loads credentials from a backing persistent store to make them available
   // after service is used between profile restarts.
   //
@@ -65,42 +60,12 @@ class ProfileOAuth2TokenService : public OAuth2TokenService,
   virtual void UpdateCredentials(const std::string& account_id,
                                  const std::string& refresh_token);
 
-  // Revokes all credentials handled by the object.
-  virtual void RevokeAllCredentials();
-
-  SigninClient* client() const { return client_; }
+  virtual void RevokeCredentials(const std::string& account_id);
 
  protected:
-  ProfileOAuth2TokenService();
-
-  // OAuth2TokenService overrides.
-  // Note: These methods are overriden so that ProfileOAuth2TokenService is a
-  // concrete class.
-
-  // Simply returns NULL and should be overriden by subsclasses.
   net::URLRequestContextGetter* GetRequestContext() override;
 
-  // Updates the internal cache of the result from the most-recently-completed
-  // auth request (used for reporting errors to the user).
-  void UpdateAuthError(const std::string& account_id,
-                       const GoogleServiceAuthError& error) override;
-
-  // Validate that the account_id argument is valid.  This method DCHECKs
-  // when invalid.
-  void ValidateAccountId(const std::string& account_id) const;
-
-  SigninErrorController* signin_error_controller() {
-    return signin_error_controller_;
-  }
-
- private:
-  // The client with which this instance was initialized, or NULL.
-  SigninClient* client_;
-
-  // The error controller with which this instance was initialized, or NULL.
-  SigninErrorController* signin_error_controller_;
-
   DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenService);
 };
 
-#endif  // COMPONENTS_SIGNIN_CORE_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_H_
+#endif  // COMPONENTS_SIGNIN_CORE_BROWSER_PROFILE_OAUTH2_TOKEN_SERVICE_H_