Show content suggestions from all categories on the NTP

chrome/browser/android/ntp/ntp_snippets_bridge.cc

Index: chrome/browser/android/ntp/ntp_snippets_bridge.cc
diff --git a/chrome/browser/android/ntp/ntp_snippets_bridge.cc b/chrome/browser/android/ntp/ntp_snippets_bridge.cc
index f6a6b5aad01e071a646229d1779f31953cc7388a..e3b89b0ad6eefb85c026c93713cce6e8bf00f91b 100644
--- a/chrome/browser/android/ntp/ntp_snippets_bridge.cc
+++ b/chrome/browser/android/ntp/ntp_snippets_bridge.cc
@@ -147,6 +147,35 @@ void NTPSnippetsBridge::OnNewSuggestions() {
   std::vector<int64_t> timestamps;
   std::vector<std::string> publishers;
   std::vector<float> scores;
+
+  // Show all other sections before ARTICLES, at most 5 suggestions per section.

[Marc Treib, 2016/07/26 12:54:08]

Can you please add a TODO that this is a temporary debug thingie?

[Philipp Keck, 2016/07/26 13:55:58]

Done.

+  for (ContentSuggestionsCategory category :
+       content_suggestions_service_->GetCategories()) {
+    if (category == ContentSuggestionsCategory::ARTICLES) {
+      continue;
+    }
+    if (content_suggestions_service_->GetCategoryStatus(category) !=
+        ContentSuggestionsCategoryStatus::AVAILABLE) {
+      continue;
+    }
+
+    int counter = 0;

[Marc Treib, 2016/07/26 12:54:08]

Why the "at most 5" logic? Since this will only happen if the user manually
enables a flag, it doesn't really matter if there are many. And the logic for
restricting the number should live in the provider.

[Philipp Keck, 2016/07/26 13:55:58]

Ok I moved it there. Testing how an empty NTP behaves or what happens when you
dismiss the last suggestion is annoying if you have to swipe away hundreds of
pages that were offlined in the background -- that's why I introduced the limit
here. It's now in the offline pages provider.

+    for (const ntp_snippets::ContentSuggestion& suggestion :
+         content_suggestions_service_->GetSuggestionsForCategory(category)) {
+      ids.push_back(suggestion.id());
+      titles.push_back(suggestion.title());
+      urls.push_back(suggestion.url().spec());
+      amp_urls.push_back(suggestion.amp_url().spec());
+      snippets.push_back(suggestion.snippet_text());
+      timestamps.push_back(suggestion.publish_date().ToJavaTime());
+      publishers.push_back(suggestion.publisher_name());
+      scores.push_back(suggestion.score());
+      if (5 == ++counter)
+        break;
+    }
+  }
+
+  // All article suggestions.
   for (const ntp_snippets::ContentSuggestion& suggestion :
        content_suggestions_service_->GetSuggestionsForCategory(
            ContentSuggestionsCategory::ARTICLES)) {