Add extra information for ReadingList ContentSuggestion

components/ntp_snippets/reading_list/reading_list_suggestions_provider.cc

 // Copyright 2017 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/reading_list/reading_list_suggestions_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/ntp_snippets/category.h"
+#include "components/ntp_snippets/reading_list/reading_list_distillation_state_util.h"
 #include "components/reading_list/core/reading_list_entry.h"
 #include "components/reading_list/core/reading_list_model.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/url_formatter.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace ntp_snippets {
 
 namespace {
 // Max number of entries to return.
@@ skipping 118 matching lines @@
     // Get the |kMaxEntries| most recent entries.
     std::partial_sort(entries.begin(), entries.begin() + kMaxEntries,
                       entries.end(), CompareEntries);
     entries.resize(kMaxEntries);
   } else {
     std::sort(entries.begin(), entries.end(), CompareEntries);
   }
 
   std::vector<ContentSuggestion> suggestions;
   for (const ReadingListEntry* entry : entries) {
-    ContentSuggestion suggestion(provided_category_, entry->URL().spec(),
-                                 entry->URL());
-
-    suggestion.set_title(base::UTF8ToUTF16(entry->Title()));
-    suggestion.set_snippet_text(
-        url_formatter::FormatUrl(entry->URL().GetOrigin()));
-    suggestions.emplace_back(std::move(suggestion));
+    suggestions.emplace_back(ConvertEntry(entry));
   }
 
   NotifyStatusChanged(CategoryStatus::AVAILABLE);
   observer()->OnNewSuggestions(this, provided_category_,
                                std::move(suggestions));
 }
 
+ContentSuggestion ReadingListSuggestionsProvider::ConvertEntry(
+    const ReadingListEntry* entry) {
+  ContentSuggestion suggestion(provided_category_, entry->URL().spec(),
+                               entry->URL());
+  suggestion.set_title(base::UTF8ToUTF16(entry->Title()));
+  suggestion.set_snippet_text(

[Marc Treib, 2017/03/29 08:24:58]

As per the comment on the other CL, I think this should be set_publisher_name

[gambard, 2017/03/29 09:54:07]

Wasn't rebased yet.
Done.

+      url_formatter::FormatUrl(entry->URL().GetOrigin()));
+
+  auto extra = base::MakeUnique<ReadingListSuggestionExtra>();
+  extra->distilled_state =
+      SuggestionStateFromReadingListState(entry->DistilledState());
+  extra->favicon_page_url =
+      entry->DistilledURL().is_valid() ? entry->DistilledURL() : entry->URL();
+  suggestion.set_reading_list_suggestion_extra(std::move(extra));
+
+  return suggestion;
+}
+
 void ReadingListSuggestionsProvider::NotifyStatusChanged(
     CategoryStatus new_status) {
   if (category_status_ == new_status) {
     return;
   }
   category_status_ = new_status;
   observer()->OnCategoryStatusChanged(this, provided_category_, new_status);
 }
 
 }  // namespace ntp_snippets