[Offline Pages] Removes two-step expiration related.

components/offline_pages/offline_page_model_query.h

 // 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.
 
 #ifndef COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_QUERY_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_QUERY_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 22 matching lines @@
   };
 
   OfflinePageModelQuery();
   virtual ~OfflinePageModelQuery();
 
   std::pair<bool, std::set<std::string>> GetRestrictedToNamespaces() const;
   std::pair<Requirement, std::set<int64_t>> GetRestrictedToOfflineIds() const;
   std::pair<Requirement, std::set<ClientId>> GetRestrictedToClientIds() const;
   std::pair<Requirement, std::set<GURL>> GetRestrictedToUrls() const;
 
-  bool GetAllowExpired() const;
-
   // This is the workhorse function that is used by the in-memory offline page
   // model, given a page it will find out whether that page matches the query.
   bool Matches(const OfflinePageItem& page) const;
 
  private:
   friend class OfflinePageModelQueryBuilder;
 
-  bool allow_expired_ = false;
-
   std::unique_ptr<std::set<std::string>> restricted_to_namespaces_;
 
   std::pair<Requirement, std::set<int64_t>> offline_ids_;
   std::pair<Requirement, std::set<ClientId>> client_ids_;
   std::pair<Requirement, std::set<GURL>> urls_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModelQuery);
 };
 
 // Used to create an offline page model query.  QueryBuilders without
-// modifications create queries that allow all pages that are not expired.
+// modifications create queries that allow all pages.
 // Can restrict results by policies provided by |ClientPolicyController|, or by
 // individual features of pages. Each restriction comes with a |Requirement|
 // that can be used to specify whether the input restriction should include or
 // exclude matching pages.
 class OfflinePageModelQueryBuilder {
  public:
   using Requirement = OfflinePageModelQuery::Requirement;
 
   OfflinePageModelQueryBuilder();
   ~OfflinePageModelQueryBuilder();
@@ skipping 28 matching lines @@
   OfflinePageModelQueryBuilder& RequireShownAsRecentlyVisitedSite(
       Requirement recently_visited);
 
   // Only include pages whose namespaces satisfy
   // ClientPolicyController::IsRestrictedToOriginalTab(|namespace|) ==
   //     |original_tab|
   // Multiple calls overwrite previous ones.
   OfflinePageModelQueryBuilder& RequireRestrictedToOriginalTab(
       Requirement original_tab);
 
-  // Resets whether we return expired pages.  If called multiple times the bit
-  // is overwritten and |allow_expired| from the last call is saved.
-  OfflinePageModelQueryBuilder& AllowExpiredPages(bool allow_expired);
-
   // Builds the query using the namespace policies provided by |controller|
   // This resets the internal state.  |controller| should not be |nullptr|.
   std::unique_ptr<OfflinePageModelQuery> Build(
       ClientPolicyController* controller);
 
  private:
   // Intersects the allowed namespaces in query_ with |namespaces|.  If
   // |inverted| is true, intersects the allowed namespaces with all namespaces
   // except those provided in |namespaces|.
   void IntersectWithNamespaces(ClientPolicyController* controller,
                                const std::vector<std::string>& namespaces,
                                Requirement match_requirement);
 
   std::pair<Requirement, std::vector<int64_t>> offline_ids_;
   std::pair<Requirement, std::vector<ClientId>> client_ids_;
   std::pair<Requirement, std::vector<GURL>> urls_;
 
   Requirement supported_by_download_ = Requirement::UNSET;
   Requirement shown_as_recently_visited_site_ = Requirement::UNSET;
   Requirement restricted_to_original_tab_ = Requirement::UNSET;
 
-  bool allow_expired_ = false;
-
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModelQueryBuilder);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_QUERY_H_