[NTP] Cleanup: offline pages related tests.

components/ntp_snippets/offline_pages/recent_tab_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 "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 125 matching lines @@
 
 void RecentTabSuggestionsProvider::ClearCachedSuggestions(Category category) {
   // Ignored.
 }
 
 void RecentTabSuggestionsProvider::GetDismissedSuggestionsForDebugging(
     Category category,
     const DismissedSuggestionsCallback& callback) {
   DCHECK_EQ(provided_category_, category);
 
-  // TODO(vitaliii): Query all pages instead by using an empty query.
+  // Offline pages which are not related to recent tabs are also queried here,
+  // so that they can be returned if they happen to be dismissed (e.g. due to a
+  // bug).
+  OfflinePageModelQueryBuilder query_builder;
   offline_page_model_->GetPagesMatchingQuery(
-      BuildRecentTabsQuery(offline_page_model_),
+      query_builder.Build(offline_page_model_->GetPolicyController()),
       base::Bind(&RecentTabSuggestionsProvider::
                      GetPagesMatchingQueryCallbackForGetDismissedSuggestions,
                  weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void RecentTabSuggestionsProvider::ClearDismissedSuggestionsForDebugging(
     Category category) {
   DCHECK_EQ(provided_category_, category);
   StoreDismissedIDsToPrefs(std::set<std::string>());
   FetchRecentTabs();
@@ skipping 144 matching lines @@
 }
 
 void RecentTabSuggestionsProvider::StoreDismissedIDsToPrefs(
     const std::set<std::string>& dismissed_ids) {
   prefs::StoreDismissedIDsToPrefs(pref_service_,
                                   prefs::kDismissedRecentOfflineTabSuggestions,
                                   dismissed_ids);
 }
 
 }  // namespace ntp_snippets