Refactor AO2TS to make it easier to componentize.

google_apis/gaia/fake_oauth2_token_service.h

Index: google_apis/gaia/fake_oauth2_token_service.h
diff --git a/google_apis/gaia/fake_oauth2_token_service.h b/google_apis/gaia/fake_oauth2_token_service.h
index ffe7b6abb31e58ba3ea21b61fd3526b6b5c4a60b..a04bbf468bac2d6d2cd1c56750a6be1b4830308e 100644
--- a/google_apis/gaia/fake_oauth2_token_service.h
+++ b/google_apis/gaia/fake_oauth2_token_service.h
@@ -5,11 +5,6 @@
 #ifndef GOOGLE_APIS_GAIA_FAKE_OAUTH2_TOKEN_SERVICE_H_
 #define GOOGLE_APIS_GAIA_FAKE_OAUTH2_TOKEN_SERVICE_H_
 
-#include <set>
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "base/memory/weak_ptr.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 namespace net {
@@ -22,8 +17,6 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
   FakeOAuth2TokenService();
   ~FakeOAuth2TokenService() override;
 
-  std::vector<std::string> GetAccounts() override;
-
   void AddAccount(const std::string& account_id);
   void RemoveAccount(const std::string& account_id);

[Roger Tawa OOO till Jul 10th, 2015/05/28 14:54:44]

I think it would be cleaner to remove these functions and have callers do:

GetDelegate()->AddAccount()
GetDelegate()->RemoveAccount()

But would that be a lot of changes?

[gogerald1, 2015/06/03 18:12:58]

Done.

 
@@ -36,9 +29,7 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
       const std::string& account_id,
       const GoogleServiceAuthError& auth_error);
 
-  void set_request_context(net::URLRequestContextGetter* request_context) {
-    request_context_ = request_context;
-  }
+  void set_request_context(net::URLRequestContextGetter* request_context);

[Roger Tawa OOO till Jul 10th, 2015/05/28 14:54:44]

Don't need this method here.  Put this method directly on the fake delegate.

Also, add a new method:

   FakeOAuth2TokenServiceDelegate* GetDelegate()

so that calling code does not need to cast when access the fake delegate.

[gogerald1, 2015/06/03 18:12:59]

Done.

 
  protected:
   // OAuth2TokenService overrides.
@@ -54,8 +45,6 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
                              const ScopeSet& scopes,
                              const std::string& access_token) override;
 
-  bool RefreshTokenIsAvailable(const std::string& account_id) const override;
-
  private:
   struct PendingRequest {
     PendingRequest();
@@ -68,19 +57,8 @@ class FakeOAuth2TokenService : public OAuth2TokenService {
     base::WeakPtr<RequestImpl> request;
   };
 
-  // OAuth2TokenService overrides.
-  net::URLRequestContextGetter* GetRequestContext() override;
-
-  OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
-      const std::string& account_id,
-      net::URLRequestContextGetter* getter,
-      OAuth2AccessTokenConsumer* consumer) override;
-
-  std::set<std::string> account_ids_;
   std::vector<PendingRequest> pending_requests_;
 
-  net::URLRequestContextGetter* request_context_;  // weak
-
   DISALLOW_COPY_AND_ASSIGN(FakeOAuth2TokenService);
 };