[NTP] Cleanup: offline pages related tests.

chrome/browser/ntp_snippets/download_suggestions_provider.cc

 // Copyright 2016 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 "chrome/browser/ntp_snippets/download_suggestions_provider.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 215 matching lines @@
   // Ignored. The internal caches are not stored on disk and they are just
   // partial copies of the data stored at OfflinePage model and DownloadManager.
   // If it is cleared there, it will be cleared in these caches as well.
 }
 
 void DownloadSuggestionsProvider::GetDismissedSuggestionsForDebugging(
     Category category,
     const ntp_snippets::DismissedSuggestionsCallback& callback) {
   DCHECK_EQ(provided_category_, category);
 
-  // TODO(vitaliii): Query all pages instead by using an empty query.
   if (offline_page_model_) {
+    // Offline pages which are not related to downloads are also queried here,
+    // so that they can be returned in case there are problems with dismissing.
+    OfflinePageModelQueryBuilder query_builder;
     offline_page_model_->GetPagesMatchingQuery(
-        BuildOfflinePageDownloadsQuery(offline_page_model_),
+        query_builder.Build(offline_page_model_->GetPolicyController()),
         base::Bind(&DownloadSuggestionsProvider::
                        GetPagesMatchingQueryCallbackForGetDismissedSuggestions,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   } else {
     GetPagesMatchingQueryCallbackForGetDismissedSuggestions(
         callback, std::vector<OfflinePageItem>());
   }
 }
 
 void DownloadSuggestionsProvider::ClearDismissedSuggestionsForDebugging(
@@ skipping 15 matching lines @@
 // Private methods
 
 void DownloadSuggestionsProvider::
     GetPagesMatchingQueryCallbackForGetDismissedSuggestions(
         const ntp_snippets::DismissedSuggestionsCallback& callback,
         const std::vector<OfflinePageItem>& offline_pages) const {
   std::set<std::string> dismissed_ids = ReadOfflinePageDismissedIDsFromPrefs();
   std::vector<ContentSuggestion> suggestions;
   for (const OfflinePageItem& item : offline_pages) {
     if (dismissed_ids.count(GetOfflinePagePerCategoryID(item.offline_id)))
       suggestions.push_back(ConvertOfflinePage(item));

[Marc Treib, 2016/11/21 15:56:57]

Random note: Does this need a rebase onto your other CL, or did that miss some
"if"s? :)

[vitaliii, 2016/11/22 06:32:46]

Done. Rebase.

   }
 
   if (download_manager_) {
     std::vector<DownloadItem*> all_downloads;
     download_manager_->GetAllDownloads(&all_downloads);
 
     dismissed_ids = ReadAssetDismissedIDsFromPrefs();
 
     for (const DownloadItem* item : all_downloads) {
       if (dismissed_ids.count(GetAssetDownloadPerCategoryID(item->GetId())))
@@ skipping 429 matching lines @@
 
 void DownloadSuggestionsProvider::UnregisterDownloadItemObservers() {
   DCHECK_NE(download_manager_, nullptr);
 
   std::vector<DownloadItem*> all_downloads;
   download_manager_->GetAllDownloads(&all_downloads);
 
   for (DownloadItem* item : all_downloads)
     item->RemoveObserver(this);
 }