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 <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/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 {
@@ skipping 119 matching lines @@
         entries.push_back(entry);
       }
       if (entries.size() > kMaxEntries) {
         entries.pop_back();
       }
     }
   }
 
   std::vector<ContentSuggestion> suggestions;
   for (const ReadingListEntry* entry : entries) {
-    ContentSuggestion suggestion(provided_category_, entry->URL().spec(),
-                                 entry->URL());
-
-    if (entry->Title().size() > 0) {
-      suggestion.set_title(base::UTF8ToUTF16(entry->Title()));
-    } else {
-      suggestion.set_title(url_formatter::FormatUrl(entry->URL()));
-    }
-    suggestion.set_snippet_text(
-        url_formatter::FormatUrl(entry->URL().GetOrigin()));
-    suggestions.emplace_back(std::move(suggestion));
+    ConvertEntry(entry, &suggestions);
   }
 
   NotifyStatusChanged(CategoryStatus::AVAILABLE);
   observer()->OnNewSuggestions(this, provided_category_,
                                std::move(suggestions));
 }
 
+void ReadingListSuggestionsProvider::ConvertEntry(
+    const ReadingListEntry* entry,
+    std::vector<ContentSuggestion>* suggestions) {

[Marc Treib, 2017/03/28 13:38:20]

I don't like out params, and IMO converting has little to do with adding to a
list. Could we just return the created ContentSuggestion, and emplace it at the
call site?

[gambard, 2017/03/29 06:51:24]

That was my first idea, but I followed the pattern used in BookmarksProvider :)
Done.

+  ContentSuggestion suggestion(provided_category_, entry->URL().spec(),
+                               entry->URL());
+  if (entry->Title().size() > 0) {
+    suggestion.set_title(base::UTF8ToUTF16(entry->Title()));
+  } else {
+    suggestion.set_title(url_formatter::FormatUrl(entry->URL()));
+  }
+  suggestion.set_snippet_text(
+      url_formatter::FormatUrl(entry->URL().GetOrigin()));
+
+  auto extra = base::MakeUnique<ReadingListSuggestionExtra>();
+  if (entry->DistilledState() == ReadingListEntry::PROCESSED) {

[Marc Treib, 2017/03/28 13:38:20]

switch?
Wrap this in a global helper method?

[Olivier, 2017/03/28 13:43:45]

switch?

[gambard, 2017/03/29 06:51:24]

Done.

[gambard, 2017/03/29 06:51:24]

Done.

+    extra->distilled_state = ReadingListSuggestionExtra::
+        ReadingListSuggestionDistilledState::SUCCESS;
+  } else if (entry->DistilledState() == ReadingListEntry::DISTILLATION_ERROR) {
+    extra->distilled_state = ReadingListSuggestionExtra::
+        ReadingListSuggestionDistilledState::FAILURE;
+  } else {
+    extra->distilled_state = ReadingListSuggestionExtra::
+        ReadingListSuggestionDistilledState::PROCESSING;
+  }
+  extra->favicon_page_url =
+      entry->DistilledURL().is_valid() ? entry->DistilledURL() : entry->URL();
+  suggestion.set_reading_list_suggestion_extra(std::move(extra));
+
+  suggestions->emplace_back(std::move(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