Allow fetching personalized snippets from ChromeReader.

components/ntp_snippets/ntp_snippets_service.cc

 // Copyright 2015 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.
 
 #include "components/ntp_snippets/ntp_snippets_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 112 matching lines @@
   std::set<std::string> hosts;
   for (int i = 0; i < suggestions.suggestions_size(); ++i) {
     const ChromeSuggestion& suggestion = suggestions.suggestions(i);
     GURL url(suggestion.url());
     if (url.is_valid())
       hosts.insert(url.host());
   }
   return hosts;
 }
 
-const char kContentInfo[] = "contentInfo";
-
 // Parses snippets from |list| and adds them to |snippets|. Returns true on
 // success, false if anything went wrong.
 bool AddSnippetsFromListValue(const base::ListValue& list,
                               NTPSnippetsService::NTPSnippetStorage* snippets) {
   for (const base::Value* const value : list) {
     const base::DictionaryValue* dict = nullptr;
     if (!value->GetAsDictionary(&dict))
       return false;
 
-    const base::DictionaryValue* content = nullptr;
-    if (!dict->GetDictionary(kContentInfo, &content))
-      return false;
     std::unique_ptr<NTPSnippet> snippet =
-        NTPSnippet::CreateFromDictionary(*content);
+        NTPSnippet::CreateFromDictionary(*dict);
     if (!snippet)
       return false;
 
     snippets->push_back(std::move(snippet));
   }
   return true;
 }
 
 std::unique_ptr<base::ListValue> SnippetsToListValue(
     const NTPSnippetsService::NTPSnippetStorage& snippets) {
   std::unique_ptr<base::ListValue> list(new base::ListValue);
   for (const auto& snippet : snippets) {
-    std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-    dict->Set(kContentInfo, snippet->ToDictionary());
+    std::unique_ptr<base::DictionaryValue> dict = snippet->ToDictionary();
     list->Append(std::move(dict));
   }
   return list;
 }
 
 bool ContainsSnippet(const NTPSnippetsService::NTPSnippetStorage& haystack,
                      const std::unique_ptr<NTPSnippet>& needle) {
   const GURL& url = needle->url();
   return std::find_if(haystack.begin(), haystack.end(),
                       [&url](const std::unique_ptr<NTPSnippet>& snippet) {
@@ skipping 62 matching lines @@
 }
 
 void NTPSnippetsService::FetchSnippets() {
   FetchSnippetsFromHosts(GetSuggestionsHosts());
 }
 
 void NTPSnippetsService::FetchSnippetsFromHosts(
     const std::set<std::string>& hosts) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDontRestrict)) {
-    snippets_fetcher_->FetchSnippets(std::set<std::string>(), kMaxSnippetCount);
+    snippets_fetcher_->FetchSnippets(std::set<std::string>(),
+                                     application_language_code_,
+                                     kMaxSnippetCount);
     return;
   }
   if (!hosts.empty()) {
-    snippets_fetcher_->FetchSnippets(hosts, kMaxSnippetCount);
+    snippets_fetcher_->FetchSnippets(hosts,
+                                     application_language_code_,
+                                     kMaxSnippetCount);
   } else {
     last_fetch_status_ = kStatusMessageEmptyHosts;
     LoadingSnippetsFinished();
   }
 }
 
 void NTPSnippetsService::RescheduleFetching() {
   // The scheduler only exists on Android so far, it's null on other platforms.
   if (!scheduler_)
     return;
@@ skipping 273 matching lines @@
     if (snippet->expiry_date() < next_expiry)
       next_expiry = snippet->expiry_date();
   }
   DCHECK_GT(next_expiry, expiry);
   expiry_timer_.Start(FROM_HERE, next_expiry - expiry,
                       base::Bind(&NTPSnippetsService::LoadingSnippetsFinished,
                                  base::Unretained(this)));
 }
 
 }  // namespace ntp_snippets