[Offline Pages] Adding support for removed-on-cache-reset pages to query.

components/offline_pages/core/offline_page_model_query.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/offline_pages/core/offline_page_model_query.h"
 
 #include <algorithm>
 #include <unordered_set>
 
 #include "base/memory/ptr_util.h"
@@ skipping 23 matching lines @@
 }
 
 OfflinePageModelQueryBuilder& OfflinePageModelQueryBuilder::SetUrls(
     Requirement requirement,
     const std::vector<GURL>& urls) {
   urls_ = std::make_pair(requirement, urls);
   return *this;
 }
 
 OfflinePageModelQueryBuilder&
+OfflinePageModelQueryBuilder::RequireRemovedOnCacheReset(
+    Requirement removed_on_cache_reset) {
+  removed_on_cache_reset_ = removed_on_cache_reset;
+  return *this;
+}
+
+OfflinePageModelQueryBuilder&
 OfflinePageModelQueryBuilder::RequireSupportedByDownload(
     Requirement supported_by_download) {
   supported_by_download_ = supported_by_download;
   return *this;
 }
 
 OfflinePageModelQueryBuilder&
 OfflinePageModelQueryBuilder::RequireShownAsRecentlyVisitedSite(
     Requirement recently_visited) {
   shown_as_recently_visited_site_ = recently_visited;
@@ skipping 24 matching lines @@
       client_ids_.first,
       std::set<ClientId>(client_ids_.second.begin(), client_ids_.second.end()));
   client_ids_ = std::make_pair(Requirement::UNSET, std::vector<ClientId>());
 
   std::vector<std::string> allowed_namespaces;
   bool uses_namespace_restrictions = false;
 
   for (auto& name_space : controller->GetAllNamespaces()) {
     // If any exclusion requirements exist, and the namespace matches one of
     // those excluded by policy, skip adding it to |allowed_namespaces|.
-    if ((supported_by_download_ == Requirement::EXCLUDE_MATCHING &&
+    if ((removed_on_cache_reset_ == Requirement::EXCLUDE_MATCHING &&
+         controller->IsRemovedOnCacheReset(name_space)) ||
+        (supported_by_download_ == Requirement::EXCLUDE_MATCHING &&
          controller->IsSupportedByDownload(name_space)) ||
         (shown_as_recently_visited_site_ == Requirement::EXCLUDE_MATCHING &&
          controller->IsShownAsRecentlyVisitedSite(name_space)) ||
         (restricted_to_original_tab_ == Requirement::EXCLUDE_MATCHING &&
          controller->IsRestrictedToOriginalTab(name_space))) {
       // Skip namespaces that meet exclusion requirements.
       uses_namespace_restrictions = true;
       continue;
     }
 
-    if ((supported_by_download_ == Requirement::INCLUDE_MATCHING &&
+    if ((removed_on_cache_reset_ == Requirement::INCLUDE_MATCHING &&
+         !controller->IsRemovedOnCacheReset(name_space)) ||
+        (supported_by_download_ == Requirement::INCLUDE_MATCHING &&
          !controller->IsSupportedByDownload(name_space)) ||
         (shown_as_recently_visited_site_ == Requirement::INCLUDE_MATCHING &&
          !controller->IsShownAsRecentlyVisitedSite(name_space)) ||
         (restricted_to_original_tab_ == Requirement::INCLUDE_MATCHING &&
          !controller->IsRestrictedToOriginalTab(name_space))) {
       // Skip namespaces that don't meet inclusion requirement.
       uses_namespace_restrictions = true;
       continue;
     }
 
     // Add namespace otherwise.
     allowed_namespaces.emplace_back(name_space);
   }
 
+  removed_on_cache_reset_ = Requirement::UNSET;
   supported_by_download_ = Requirement::UNSET;
   shown_as_recently_visited_site_ = Requirement::UNSET;
   restricted_to_original_tab_ = Requirement::UNSET;
 
   if (uses_namespace_restrictions) {
     query->restricted_to_namespaces_ = base::MakeUnique<std::set<std::string>>(
         allowed_namespaces.begin(), allowed_namespaces.end());
   }
 
   return query;
@@ skipping 77 matching lines @@
     case Requirement::EXCLUDE_MATCHING:
       if (client_ids_.second.count(client_id) > 0)
         return false;
       break;
   }
 
   return true;
 }
 
 }  // namespace offline_pages