📰 Persist category dismissals

components/ntp_snippets/remote/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/remote/ntp_snippets_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 943 matching lines @@
       state_ = State::ERROR_OCCURRED;
       EnterStateError();
       break;
   }
 
   // Schedule or un-schedule background fetching after each state change.
   RescheduleFetching(false);
 }
 
 void NTPSnippetsService::NotifyNewSuggestions() {
+  ContentSuggestionsProvider::Observer::SuggestionBatch receivedSuggestions;
+
   for (const auto& item : categories_) {
     Category category = item.first;
     const CategoryContent& content = item.second;
 
     std::vector<ContentSuggestion> result;
     for (const std::unique_ptr<NTPSnippet>& snippet : content.snippets) {
       // TODO(sfiera): if a snippet is not going to be displayed, move it
       // directly to content.dismissed on fetch. Otherwise, we might prune
       // other snippets to get down to kMaxSnippetCount, only to hide one of the
       // incomplete ones we kept.
       if (!snippet->is_complete())
         continue;
       ContentSuggestion suggestion(category, snippet->id(),
                                    snippet->best_source().url);
       suggestion.set_amp_url(snippet->best_source().amp_url);
       suggestion.set_title(base::UTF8ToUTF16(snippet->title()));
       suggestion.set_snippet_text(base::UTF8ToUTF16(snippet->snippet()));
       suggestion.set_publish_date(snippet->publish_date());
       suggestion.set_publisher_name(
           base::UTF8ToUTF16(snippet->best_source().publisher_name));
       suggestion.set_score(snippet->score());
       result.emplace_back(std::move(suggestion));
     }
 
-    DVLOG(1) << "NotifyNewSuggestions(): " << result.size()
-             << " items in category " << category;
-    observer()->OnNewSuggestions(this, category, std::move(result));
+    receivedSuggestions[category] = std::move(result);
   }
+
+  observer()->OnNewSuggestionBatch(this, std::move(receivedSuggestions));
 }
 
 void NTPSnippetsService::UpdateCategoryStatus(Category category,
                                               CategoryStatus status) {
   DCHECK(base::ContainsKey(categories_, category));
   CategoryContent& content = categories_[category];
   if (status == content.status)
     return;
 
   DVLOG(1) << "UpdateCategoryStatus(): " << category.id() << ": "
@@ skipping 99 matching lines @@
 }
 
 NTPSnippetsService::CategoryContent::CategoryContent() = default;
 NTPSnippetsService::CategoryContent::CategoryContent(CategoryContent&&) =
     default;
 NTPSnippetsService::CategoryContent::~CategoryContent() = default;
 NTPSnippetsService::CategoryContent& NTPSnippetsService::CategoryContent::
 operator=(CategoryContent&&) = default;
 
 }  // namespace ntp_snippets