Connecting UserClassifier to NtpSnippetsFetcher

components/ntp_snippets/remote/ntp_snippets_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_NTP_SNIPPETS_FETCHER_H_
 #define COMPONENTS_NTP_SNIPPETS_REMOTE_NTP_SNIPPETS_FETCHER_H_
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "components/ntp_snippets/remote/ntp_snippet.h"
 #include "components/ntp_snippets/remote/request_throttler.h"
+#include "components/ntp_snippets/user_classifier.h"

[Marc Treib, 2016/10/06 13:41:55]

Not needed I think, the forward decl below should suffice. (In any case, do only
one of the two)

[jkrcal, 2016/10/06 14:45:58]

Done.

 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 
 class PrefService;
 class SigninManagerBase;
 
 namespace base {
 class Value;
 }  // namespace base
 
 namespace ntp_snippets {
 
+class UserClassifier;
+
 // Fetches snippet data for the NTP from the server.
 class NTPSnippetsFetcher : public OAuth2TokenService::Consumer,
                            public OAuth2TokenService::Observer,
                            public net::URLFetcherDelegate {
  public:
   // Callbacks for JSON parsing, needed because the parsing is platform-
   // dependent.
   using SuccessCallback = base::Callback<void(std::unique_ptr<base::Value>)>;
   using ErrorCallback = base::Callback<void(const std::string&)>;
   using ParseJSONCallback = base::Callback<
@@ skipping 41 matching lines @@
     kBoth
   };
 
   NTPSnippetsFetcher(
       SigninManagerBase* signin_manager,
       OAuth2TokenService* token_service,
       scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
       PrefService* pref_service,
       CategoryFactory* category_factory,
       const ParseJSONCallback& parse_json_callback,
-      const std::string& api_key);
+      const std::string& api_key,
+      const UserClassifier* user_classifier);
   ~NTPSnippetsFetcher() override;
 
   // Set a callback that is called when a new set of snippets are downloaded,
   // overriding any previously set callback.
   void SetCallback(const SnippetsAvailableCallback& callback);
 
   // Fetches snippets from the server. |hosts| restricts the results to a set of
   // hosts, e.g. "www.google.com". If host restrictions are enabled, an empty
   // host set produces an error without issuing a fetch.
   //
@@ skipping 52 matching lines @@
 
   struct RequestParams {
     FetchAPI fetch_api;
     std::string obfuscated_gaia_id;
     bool only_return_personalized_results;
     std::string user_locale;
     std::set<std::string> host_restricts;
     std::set<std::string> excluded_ids;
     int count_to_fetch;
     bool interactive_request;
+    std::string user_class;
 
     RequestParams();
     ~RequestParams();
 
     std::string BuildRequest();
   };
 
   void FetchSnippetsImpl(const GURL& url,
                          const std::string& auth_header,
                          const std::string& request);
@@ skipping 68 matching lines @@
   Personalization personalization_;
   // Should we apply host restriction? It is loaded from variation parameters.
   bool use_host_restriction_;
 
   // Is the request user initiated?
   bool interactive_request_;
 
   // Allow for an injectable tick clock for testing.
   std::unique_ptr<base::TickClock> tick_clock_;
 
+  // Classifier that tells us how active the user is. Not owned.
+  const UserClassifier* user_classifier_;
+
   // Request throttler for limiting requests.
   RequestThrottler request_throttler_;
 
   // When a token request gets canceled, we want to retry once.
   bool oauth_token_retried_;
 
   base::WeakPtrFactory<NTPSnippetsFetcher> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsFetcher);
 };
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REMOTE_NTP_SNIPPETS_FETCHER_H_