Signin/OAuth: Create an AccessTokenFetcher helper class

components/suggestions/suggestions_service_impl.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_SUGGESTIONS_SUGGESTIONS_SERVICE_IMPL_H_
 #define COMPONENTS_SUGGESTIONS_SUGGESTIONS_SERVICE_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_list.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/scoped_observer.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
+#include "components/signin/core/browser/access_token_fetcher.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/suggestions/suggestions_service.h"
 #include "components/sync/driver/sync_service_observer.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class OAuth2TokenService;
 class SigninManagerBase;
 
 namespace net {
@@ skipping 12 matching lines @@
 
 class BlacklistStore;
 class ImageManager;
 class SuggestionsStore;
 
 // Actual (non-test) implementation of the SuggestionsService interface.
 class SuggestionsServiceImpl : public SuggestionsService,
                                public net::URLFetcherDelegate,
                                public syncer::SyncServiceObserver {
  public:
-  SuggestionsServiceImpl(const SigninManagerBase* signin_manager,
+  SuggestionsServiceImpl(SigninManagerBase* signin_manager,
                          OAuth2TokenService* token_service,
                          syncer::SyncService* sync_service,
                          net::URLRequestContextGetter* url_request_context,
                          std::unique_ptr<SuggestionsStore> suggestions_store,
                          std::unique_ptr<ImageManager> thumbnail_manager,
                          std::unique_ptr<BlacklistStore> blacklist_store);
   ~SuggestionsServiceImpl() override;
 
   // SuggestionsService implementation.
   bool FetchSuggestionsData() override;
@@ skipping 47 matching lines @@
   // syncer::SyncServiceObserver implementation.
   void OnStateChanged() override;
 
   // Sets default timestamp for suggestions which do not have expiry timestamp.
   void SetDefaultExpiryTimestamp(SuggestionsProfile* suggestions,
                                  int64_t timestamp_usec);
 
   // Issues a network request if there isn't already one happening.
   void IssueRequestIfNoneOngoing(const GURL& url);
 
+  // Called when an access token request completes (successfully or not).
+  void AccessTokenAvailable(const GURL& url, const std::string& access_token);
+
   // Issues a network request for suggestions (fetch, blacklist, or clear
-  // blacklist, depending on |url|). |access_token| is used only if OAuth2
-  // authentication is enabled.
+  // blacklist, depending on |url|).
   void IssueSuggestionsRequest(const GURL& url,
                                const std::string& access_token);
 
   // Creates a request to the suggestions service, properly setting headers.
   // If OAuth2 authentication is enabled, |access_token| should be a valid
   // OAuth2 access token, and will be written into an auth header.
   std::unique_ptr<net::URLFetcher> CreateSuggestionsRequest(
       const GURL& url,
       const std::string& access_token);
 
@@ skipping 17 matching lines @@
 
   // Adds extra data to suggestions profile.
   void PopulateExtraData(SuggestionsProfile* suggestions);
 
   // Test seams.
   base::TimeDelta blacklist_delay() const { return scheduling_delay_; }
   void set_blacklist_delay(base::TimeDelta delay) { scheduling_delay_ = delay; }
 
   base::ThreadChecker thread_checker_;
 
+  SigninManagerBase* signin_manager_;
+  OAuth2TokenService* token_service_;
+
   syncer::SyncService* sync_service_;
   ScopedObserver<syncer::SyncService, syncer::SyncServiceObserver>
       sync_service_observer_;
 
   net::URLRequestContextGetter* url_request_context_;
 
   // The cache for the suggestions.
   std::unique_ptr<SuggestionsStore> suggestions_store_;
 
   // Used to obtain server thumbnails, if available.
   std::unique_ptr<ImageManager> thumbnail_manager_;
 
   // The local cache for temporary blacklist, until uploaded to the server.
   std::unique_ptr<BlacklistStore> blacklist_store_;
 
   // Delay used when scheduling a blacklisting task.
   base::TimeDelta scheduling_delay_;
 
-  // Helper for fetching OAuth2 access tokens.
-  class AccessTokenFetcher;
+  // Helper for fetching OAuth2 access tokens. This is non-null iff an access
+  // token request is currently in progress.
   std::unique_ptr<AccessTokenFetcher> token_fetcher_;
 
   // Contains the current suggestions fetch request. Will only have a value
   // while a request is pending, and will be reset by |OnURLFetchComplete| or
   // if cancelled.
   std::unique_ptr<net::URLFetcher> pending_request_;
 
   // The start time of the previous suggestions request. This is used to measure
   // the latency of requests. Initially zero.
   base::TimeTicks last_request_started_time_;
 
   ResponseCallbackList callback_list_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<SuggestionsServiceImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SuggestionsServiceImpl);
 };
 
 }  // namespace suggestions
 
 #endif  // COMPONENTS_SUGGESTIONS_SUGGESTIONS_SERVICE_IMPL_H_