[Offline Pages] Removes two-step expiration related.

components/offline_pages/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/offline_page_model_query.h"
 
 #include <algorithm>
 #include <unordered_set>
 
 #include "base/memory/ptr_util.h"
@@ skipping 43 matching lines @@
   return *this;
 }
 
 OfflinePageModelQueryBuilder&
 OfflinePageModelQueryBuilder::RequireRestrictedToOriginalTab(
     Requirement original_tab) {
   restricted_to_original_tab_ = original_tab;
   return *this;
 }
 
-OfflinePageModelQueryBuilder& OfflinePageModelQueryBuilder::AllowExpiredPages(
-    bool allow_expired) {
-  allow_expired_ = allow_expired;
-  return *this;
-}
-
 std::unique_ptr<OfflinePageModelQuery> OfflinePageModelQueryBuilder::Build(
     ClientPolicyController* controller) {
   DCHECK(controller);
 
   auto query = base::MakeUnique<OfflinePageModelQuery>();
 
-  query->allow_expired_ = allow_expired_;
   query->urls_ = std::make_pair(
       urls_.first, std::set<GURL>(urls_.second.begin(), urls_.second.end()));
   urls_ = std::make_pair(Requirement::UNSET, std::vector<GURL>());
   query->offline_ids_ = std::make_pair(
       offline_ids_.first, std::set<int64_t>(offline_ids_.second.begin(),
                                             offline_ids_.second.end()));
   offline_ids_ = std::make_pair(Requirement::UNSET, std::vector<int64_t>());
   query->client_ids_ = std::make_pair(
       client_ids_.first,
       std::set<ClientId>(client_ids_.second.begin(), client_ids_.second.end()));
@@ skipping 71 matching lines @@
 }
 
 std::pair<Requirement, std::set<GURL>>
 OfflinePageModelQuery::GetRestrictedToUrls() const {
   if (urls_.first == Requirement::UNSET)
     return std::make_pair(Requirement::UNSET, std::set<GURL>());
 
   return urls_;
 }
 
-bool OfflinePageModelQuery::GetAllowExpired() const {
-  return allow_expired_;
-}
-
 bool OfflinePageModelQuery::Matches(const OfflinePageItem& item) const {
-  if (!allow_expired_ && item.IsExpired())
-    return false;
-
   switch (offline_ids_.first) {
     case Requirement::UNSET:
       break;
     case Requirement::INCLUDE_MATCHING:
       if (offline_ids_.second.count(item.offline_id) == 0)
         return false;
       break;
     case Requirement::EXCLUDE_MATCHING:
       if (offline_ids_.second.count(item.offline_id) > 0)
         return false;
@@ skipping 29 matching lines @@
     case Requirement::EXCLUDE_MATCHING:
       if (client_ids_.second.count(client_id) > 0)
         return false;
       break;
   }
 
   return true;
 }
 
 }  // namespace offline_pages