Remove the "exclude archived snippets" from the snippets fetching code.

components/ntp_snippets/remote/remote_suggestions_provider.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/remote_suggestions_provider.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 312 matching lines @@
     bool interactive_request) {
   // TODO(tschumann): FetchSnippets() and FetchSnippetsFromHost() implement the
   // fetch logic when called by the background fetcher or interactive "reload"
   // requests. Fetch() is right now only called for the fetch-more use case.
   // The names are confusing and we need to clean them up.
   if (!ready()) {
     return;
   }
   MarkEmptyCategoriesAsLoading();
 
-  NTPSnippetsFetcher::Params params =
-      BuildFetchParams(/*exclude_archived_suggestions=*/true);
+  NTPSnippetsFetcher::Params params = BuildFetchParams();
   params.hosts = hosts;
   params.interactive_request = interactive_request;
   snippets_fetcher_->FetchSnippets(
       params, base::BindOnce(&RemoteSuggestionsProvider::OnFetchFinished,
                              base::Unretained(this)));
 }
 
 void RemoteSuggestionsProvider::Fetch(
     const Category& category,
     const std::set<std::string>& known_suggestion_ids,
     const FetchDoneCallback& callback) {
   if (!ready()) {
     CallWithEmptyResults(callback,
                          Status(StatusCode::TEMPORARY_ERROR,
                                 "RemoteSuggestionsProvider is not ready!"));
     return;
   }
-  NTPSnippetsFetcher::Params params =
-      BuildFetchParams(/*exclude_archived_suggestions=*/false);
+  NTPSnippetsFetcher::Params params = BuildFetchParams();
   params.excluded_ids.insert(known_suggestion_ids.begin(),
                              known_suggestion_ids.end());
   params.interactive_request = true;
   params.exclusive_category = category;
 
   // TODO(tschumann): NTPSnippetsFetcher does not support concurrent requests
   // yet. If a background fetch happens while we fetch-more data, the callback
   // will never get called.
   snippets_fetcher_->FetchSnippets(
       params, base::BindOnce(&RemoteSuggestionsProvider::OnFetchMoreFinished,
                              base::Unretained(this), callback));
 }
 
 // Builds default fetcher params.
-NTPSnippetsFetcher::Params RemoteSuggestionsProvider::BuildFetchParams(
-    bool exclude_archived_suggestions) const {
+NTPSnippetsFetcher::Params RemoteSuggestionsProvider::BuildFetchParams() const {
   NTPSnippetsFetcher::Params result;
   result.language_code = application_language_code_;
   result.count_to_fetch = kMaxSnippetCount;
   for (const auto& map_entry : category_contents_) {
     const CategoryContent& content = map_entry.second;
     for (const auto& dismissed_snippet : content.dismissed) {
       result.excluded_ids.insert(dismissed_snippet->id());
     }
-    if (exclude_archived_suggestions) {
-      for (const auto& archived_snippet : content.archived) {
-        result.excluded_ids.insert(archived_snippet->id());
-      }
-    }
   }
   return result;
 }
 
 void RemoteSuggestionsProvider::MarkEmptyCategoriesAsLoading() {
   for (const auto& item : category_contents_) {
     Category category = item.first;
     const CategoryContent& content = item.second;
     if (content.snippets.empty()) {
       UpdateCategoryStatus(category, CategoryStatus::AVAILABLE_LOADING);
@@ skipping 943 matching lines @@
 RemoteSuggestionsProvider::CategoryContent::CategoryContent(CategoryContent&&) =
     default;
 
 RemoteSuggestionsProvider::CategoryContent::~CategoryContent() = default;
 
 RemoteSuggestionsProvider::CategoryContent&
 RemoteSuggestionsProvider::CategoryContent::operator=(CategoryContent&&) =
     default;
 
 }  // namespace ntp_snippets