Refactor AO2TS to make it easier to componentize.

chrome/browser/signin/fake_profile_oauth2_token_service.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_FAKE_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_FAKE_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 40 matching lines @@
     std::string account_id;
     std::string client_id;
     std::string client_secret;
     ScopeSet scopes;
     base::WeakPtr<RequestImpl> request;
   };
 
   FakeProfileOAuth2TokenService();
   ~FakeProfileOAuth2TokenService() override;
 
-  // Overriden to make sure it works on Android.
-  bool RefreshTokenIsAvailable(const std::string& account_id) const override;
-
-  // Overriden to make sure it works on iOS.
-  void LoadCredentials(const std::string& primary_account_id) override;
-
-  std::vector<std::string> GetAccounts() override;
-
-  // Overriden to make sure it works on Android.  Simply calls
-  // IssueRefreshToken().
-  void UpdateCredentials(const std::string& account_id,
-                         const std::string& refresh_token) override;
-
   // Sets the current refresh token. If |token| is non-empty, this will invoke
   // OnRefreshTokenAvailable() on all Observers, otherwise this will invoke
   // OnRefreshTokenRevoked().
   void IssueRefreshToken(const std::string& token);
 
   // TODO(fgorski,rogerta): Merge with UpdateCredentials when this class fully
   // supports multiple accounts.
   void IssueRefreshTokenForUser(const std::string& account_id,
                                 const std::string& token);
 
   // Fire OnRefreshTokensLoaded on all observers.
   void IssueAllRefreshTokensLoaded();

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

We don't need the three IssueXXX methods above, since they simply delegate.

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

Done.

 
   // Gets a list of active requests (can be used by tests to validate that the
   // correct request has been issued).
   std::vector<PendingRequest> GetPendingRequests();
 
   // Helper routines to issue tokens for pending requests.
   void IssueAllTokensForAccount(const std::string& account_id,
                                 const std::string& access_token,
                                 const base::Time& expiration);
 
@@ skipping 19 matching lines @@
 
  protected:
   // OAuth2TokenService overrides.
   void FetchOAuth2Token(RequestImpl* request,
                         const std::string& account_id,
                         net::URLRequestContextGetter* getter,
                         const std::string& client_id,
                         const std::string& client_secret,
                         const ScopeSet& scopes) override;
 
-  OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
-      const std::string& account_id,
-      net::URLRequestContextGetter* getter,
-      OAuth2AccessTokenConsumer* consumer) override;
-
   void InvalidateOAuth2Token(const std::string& account_id,
                              const std::string& client_id,
                              const ScopeSet& scopes,
                              const std::string& access_token) override;
-
-  net::URLRequestContextGetter* GetRequestContext() override;
-
  private:
   // Helper function to complete pending requests - if |all_scopes| is true,
   // then all pending requests are completed, otherwise, only those requests
   // matching |scopes| are completed.  If |account_id| is empty, then pending
   // requests for all accounts are completed, otherwise only requests for the
   // given account.
   void CompleteRequests(const std::string& account_id,
                         bool all_scopes,
                         const ScopeSet& scopes,
                         const GoogleServiceAuthError& error,
                         const std::string& access_token,
                         const base::Time& expiration);
 
-  std::string GetRefreshToken(const std::string& account_id) const;
-
   std::vector<PendingRequest> pending_requests_;
 
-  // Maps account ids to their refresh token strings.
-  std::map<std::string, std::string> refresh_tokens_;
-
   // If true, then this fake service will post responses to
   // |FetchOAuth2Token| on the current run loop. There is no need to call
   // |IssueTokenForScope| in this case.
   bool auto_post_fetch_response_on_message_loop_;
 
   base::WeakPtrFactory<FakeProfileOAuth2TokenService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeProfileOAuth2TokenService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_FAKE_PROFILE_OAUTH2_TOKEN_SERVICE_H_