Sending LanguageModel info to suggestions server

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 "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 ListValue;
 class Value;
 }  // namespace base
 
+namespace translate {
+class LanguageModel;
+}  // namespace translate
+
 namespace ntp_snippets {
 
 // 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>)>;
@@ skipping 42 matching lines @@
     kNonPersonal,
     kBoth
   };
 
   NTPSnippetsFetcher(
       SigninManagerBase* signin_manager,
       OAuth2TokenService* token_service,
       scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
       PrefService* pref_service,
       CategoryFactory* category_factory,
+      translate::LanguageModel* language_model,
       const ParseJSONCallback& parse_json_callback,
       const std::string& api_key);
   ~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 |hosts| is empty, no host restrictions are
@@ skipping 37 matching lines @@
   }
 
   void SetPersonalizationForTesting(Personalization personalization) {
     personalization_ = personalization;
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest, BuildRequestAuthenticated);
   FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest, BuildRequestUnauthenticated);
   FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest, BuildRequestExcludedIds);
+  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest,
+                           BuildRequestWithTwoLanguages);
+  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest,
+                           BuildRequestWithUILanguageOnly);
+  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest,
+                           BuildRequestWithOtherLanguageOnly);
 
   enum FetchAPI {
     CHROME_READER_API,
     CHROME_CONTENT_SUGGESTIONS_API,
   };
 
+  struct ContentLanguageInfo {

[Bernhard Bauer, 2016/10/07 12:26:13]

Why don't we just use LanguageModel::LanguageInfo for this?

[jkrcal, 2016/10/07 12:58:43]

Good point. Done.

+    // ISO 639 code.
+    std::string language_code;
+
+    // The frequency of the given language
+    float frequency;
+
+    ContentLanguageInfo();
+    ~ContentLanguageInfo() = default;
+
+    void AppendToList(base::ListValue* list);
+  };
+
   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;
+    ContentLanguageInfo ui_language;
+    ContentLanguageInfo other_top_language;
 
     RequestParams();
     ~RequestParams();
 
     std::string BuildRequest();
   };
 
   void FetchSnippetsImpl(const GURL& url,
                          const std::string& auth_header,
                          const std::string& request);
+  void SetUpCommonFetchingParameters(RequestParams* params) const;
   void FetchSnippetsNonAuthenticated();
   void FetchSnippetsAuthenticated(const std::string& account_id,
                                   const std::string& oauth_access_token);
   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,
@@ skipping 15 matching lines @@
 
   // Authorization for signed-in users.
   SigninManagerBase* signin_manager_;
   OAuth2TokenService* token_service_;
   std::unique_ptr<OAuth2TokenService::Request> oauth_request_;
   bool waiting_for_refresh_token_;
 
   // Holds the URL request context.
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
 
+  // Weak references, not owned.
   CategoryFactory* const category_factory_;
+  translate::LanguageModel* const language_model_;
+
   const ParseJSONCallback parse_json_callback_;
   base::TimeTicks fetch_start_time_;
   std::string last_status_;
   std::string last_fetch_json_;
 
   // Hosts to restrict the snippets to.
   std::set<std::string> hosts_;
 
   // Snippets to exclude from the results.
   std::set<std::string> excluded_ids_;
@@ skipping 33 matching lines @@
   // 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_