RemoteSuggestionsFetcher: Use common AccessTokenFetcher helper class

components/ntp_snippets/remote/remote_suggestions_fetcher.h

 // Copyright 2016 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 COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_FETCHER_H_
 #define COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_FETCHER_H_
 
 #include <memory>
 #include <queue>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/optional.h"
 #include "base/time/clock.h"
 #include "base/time/tick_clock.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/remote/json_request.h"
 #include "components/ntp_snippets/remote/remote_suggestion.h"
 #include "components/ntp_snippets/remote/request_params.h"
 #include "components/ntp_snippets/status.h"
 #include "components/translate/core/browser/language_model.h"
 #include "components/version_info/version_info.h"
 #include "net/url_request/url_request_context_getter.h"
 
+class AccessTokenFetcher;
+class OAuth2TokenService;
 class PrefService;
 class SigninManagerBase;
 
 namespace base {
 class Value;
 }  // namespace base
 
 namespace ntp_snippets {
 
 class UserClassifier;
@@ skipping 15 matching lines @@
     const base::Optional<base::string16>& title);
 
 // Provides the CategoryInfo data for other remote suggestions.
 CategoryInfo BuildRemoteCategoryInfo(const base::string16& title,
                                      bool allow_fetching_more_results);
 
 // Fetches suggestion data for the NTP from the server.
 // TODO(fhorschig): Untangle cyclic dependencies by introducing a
 // RemoteSuggestionsFetcherInterface. (Would be good for mock implementations,
 // too!)
-class RemoteSuggestionsFetcher : public OAuth2TokenService::Consumer,
-                                 public OAuth2TokenService::Observer {
+class RemoteSuggestionsFetcher {
  public:
   struct FetchedCategory {
     Category category;
     CategoryInfo info;
     RemoteSuggestion::PtrVector suggestions;
 
     FetchedCategory(Category c, CategoryInfo&& info);
     FetchedCategory(FetchedCategory&&);             // = default, in .cc
     ~FetchedCategory();                             // = default, in .cc
     FetchedCategory& operator=(FetchedCategory&&);  // = default, in .cc
   };
   using FetchedCategoriesVector = std::vector<FetchedCategory>;
   using OptionalFetchedCategories = base::Optional<FetchedCategoriesVector>;
 
   using SnippetsAvailableCallback =
       base::OnceCallback<void(Status status,
                               OptionalFetchedCategories fetched_categories)>;
 
   RemoteSuggestionsFetcher(
       SigninManagerBase* signin_manager,
       OAuth2TokenService* token_service,
       scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
       PrefService* pref_service,
       translate::LanguageModel* language_model,
       const ParseJSONCallback& parse_json_callback,
       const GURL& api_endpoint,
       const std::string& api_key,
       const UserClassifier* user_classifier);
-  ~RemoteSuggestionsFetcher() override;
+  ~RemoteSuggestionsFetcher();
 
   // Initiates a fetch from the server. When done (successfully or not), calls
   // the callback.
   //
   // If an ongoing fetch exists, both fetches won't influence each other (i.e.
   // every callback will be called exactly once).
   void FetchSnippets(const RequestParams& params,
                      SnippetsAvailableCallback callback);
 
   // Debug string representing the status/result of the last fetch attempt.
@@ skipping 24 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
                            BuildRequestWithUILanguageOnly);
   FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
                            BuildRequestWithOtherLanguageOnly);
   friend class ChromeReaderSnippetsFetcherTest;
 
   void FetchSnippetsNonAuthenticated(internal::JsonRequest::Builder builder,
                                      SnippetsAvailableCallback callback);
   void FetchSnippetsAuthenticated(internal::JsonRequest::Builder builder,
                                   SnippetsAvailableCallback callback,
-                                  const std::string& account_id,
                                   const std::string& oauth_access_token);
   void StartRequest(internal::JsonRequest::Builder builder,
                     SnippetsAvailableCallback callback);
 
   void StartTokenRequest();
 
-  // OAuth2TokenService::Consumer overrides:
-  void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
-                         const std::string& access_token,
-                         const base::Time& expiration_time) override;
-  void OnGetTokenFailure(const OAuth2TokenService::Request* request,
-                         const GoogleServiceAuthError& error) override;
-
-  // OAuth2TokenService::Observer overrides:
-  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void AccessTokenFetchFinished(const GoogleServiceAuthError& error,
+                                const std::string& access_token);
+  void AccessTokenError(const GoogleServiceAuthError& error);
 
   void JsonRequestDone(std::unique_ptr<internal::JsonRequest> request,
                        SnippetsAvailableCallback callback,
                        std::unique_ptr<base::Value> result,
                        internal::FetchResult status_code,
                        const std::string& error_details);
   void FetchFinished(OptionalFetchedCategories categories,
                      SnippetsAvailableCallback callback,
                      internal::FetchResult status_code,
                      const std::string& error_details);
 
   bool JsonToSnippets(const base::Value& parsed,
                       FetchedCategoriesVector* categories,
                       const base::Time& fetch_time);
 
   // Authentication for signed-in users.
   SigninManagerBase* signin_manager_;
   OAuth2TokenService* token_service_;
-  std::unique_ptr<OAuth2TokenService::Request> oauth_request_;
-  bool waiting_for_refresh_token_ = false;
 
-  // When a token request gets canceled, we want to retry once.
-  bool oauth_token_retried_ = false;
+  std::unique_ptr<AccessTokenFetcher> token_fetcher_;
 
   // Holds the URL request context.
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
 
   // Stores requests that wait for an access token.
   std::queue<
       std::pair<internal::JsonRequest::Builder, SnippetsAvailableCallback>>
       pending_requests_;
 
   // Weak reference, not owned.
@@ skipping 16 matching lines @@
   // Info on the last finished fetch.
   std::string last_status_;
   std::string last_fetch_json_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteSuggestionsFetcher);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_FETCHER_H_