[Offline Pages] Removes two-step expiration related.

components/offline_pages/offline_page_model_query.h

Index: components/offline_pages/offline_page_model_query.h
diff --git a/components/offline_pages/offline_page_model_query.h b/components/offline_pages/offline_page_model_query.h
index ddc8e837d83082468ce6ffc7a98bb4cda5057a25..a1c22c6a859054303000dc135a6bfc408b56eea4 100644
--- a/components/offline_pages/offline_page_model_query.h
+++ b/components/offline_pages/offline_page_model_query.h
@@ -40,8 +40,6 @@ class OfflinePageModelQuery {
   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;
@@ -49,8 +47,6 @@ class OfflinePageModelQuery {
  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_;
@@ -61,7 +57,7 @@ class 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
@@ -110,10 +106,6 @@ class OfflinePageModelQueryBuilder {
   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(
@@ -135,8 +127,6 @@ class OfflinePageModelQueryBuilder {
   Requirement shown_as_recently_visited_site_ = Requirement::UNSET;
   Requirement restricted_to_original_tab_ = Requirement::UNSET;
 
-  bool allow_expired_ = false;
-
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModelQueryBuilder);
 };