[Offline Pages] Removes two-step expiration related.

components/offline_pages/offline_page_model_impl.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_IMPL_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 72 matching lines @@
       const std::vector<ClientId>& client_ids,
       const MultipleOfflinePageItemCallback& callback) override;
 
   void DeleteCachedPagesByURLPredicate(
       const UrlPredicate& predicate,
       const DeletePageCallback& callback) override;
   void CheckPagesExistOffline(
       const std::set<GURL>& urls,
       const CheckPagesExistOfflineCallback& callback) override;
   void GetAllPages(const MultipleOfflinePageItemCallback& callback) override;
-  void GetAllPagesWithExpired(
-      const MultipleOfflinePageItemCallback& callback) override;
   void GetOfflineIdsForClientId(
       const ClientId& client_id,
       const MultipleOfflineIdCallback& callback) override;
   void GetPageByOfflineId(
       int64_t offline_id,
       const SingleOfflinePageItemCallback& callback) override;
   void GetPagesByURL(
       const GURL& url,
       URLSearchMode url_search_mode,
       const MultipleOfflinePageItemCallback& callback) override;
-  void ExpirePages(const std::vector<int64_t>& offline_ids,
-                   const base::Time& expiration_time,
-                   const base::Callback<void(bool)>& callback) override;
   ClientPolicyController* GetPolicyController() override;
 
   // Methods for testing only:
   OfflinePageMetadataStore* GetStoreForTesting();
   void set_testing_clock(base::Clock* clock) { testing_clock_ = clock; }
 
   OfflinePageStorageManager* GetStorageManager();
 
   bool is_loaded() const override;
 
@@ skipping 73 matching lines @@
       std::unique_ptr<OfflinePagesUpdateResult> result);
   void InformDeletePageDone(const DeletePageCallback& callback,
                             DeletePageResult result);
 
   void OnMarkPageAccesseDone(const OfflinePageItem& offline_page_item,
                              std::unique_ptr<OfflinePagesUpdateResult> result);
 
   // Callbacks for checking metadata consistency.
   void CheckMetadataConsistencyForArchivePaths(
       const std::set<base::FilePath>& archive_paths);
-  // Callback called after headless archives deleted. Orphaned archives are
+  // Callbacks called after orphaned archives deleted. Orphaned archives are

[fgorski, 2016/11/22 00:03:00]

nit: archives *are* deleted. since you are fixing it, pleas turn it into a
sentence.

[romax, 2016/11/23 23:32:03]

Done.

   // archives files on disk which are not pointed to by any of the page items
   // in metadata store.
-  void ExpirePagesMissingArchiveFile(
+  void DeletePagesMissingArchiveFile(
       const std::set<base::FilePath>& archive_paths);
-  void OnExpirePagesMissingArchiveFileDone(
+  void OnDeletePagesMissingArchiveFileDone(
       const std::vector<int64_t>& offline_ids,
-      bool success);
+      DeletePageResult result);
   void DeleteOrphanedArchives(const std::set<base::FilePath>& archive_paths);
   void OnDeleteOrphanedArchivesDone(const std::vector<base::FilePath>& archives,
                                     bool success);
 
   // Callbacks for deleting pages with same URL when saving pages.
   void DeleteExistingPagesWithSameURL(const OfflinePageItem& offline_page);
   void OnPagesFoundWithSameURL(const OfflinePageItem& offline_page,
                                size_t pages_allowed,
                                const MultipleOfflinePageItemResult& items);
   void OnDeleteOldPagesWithSameURL(DeletePageResult result);
 
   void CacheLoadedData(const std::vector<OfflinePageItem>& offline_pages);
 
   // Actually does the work of deleting, requires the model is loaded.
   void DoDeletePagesByOfflineId(const std::vector<int64_t>& offline_ids,
                                 const DeletePageCallback& callback);
 
   // Actually does the work of deleting, requires the model is loaded.
   void DeletePages(const DeletePageCallback& callback,
                    const MultipleOfflinePageItemResult& items);
 
   void DoGetPagesByClientIds(const std::vector<ClientId>& client_ids,
                              const MultipleOfflinePageItemCallback& callback);
 
   // Similar to DoDeletePagesByOfflineId, does actual work of deleting, and
   // requires that the model is loaded.
   void DoDeleteCachedPagesByURLPredicate(const UrlPredicate& predicate,
                                          const DeletePageCallback& callback);
 
-  // Callback completing page expiration.
-  void OnExpirePageDone(const base::Time& expiration_time,
-                        std::unique_ptr<OfflinePagesUpdateResult> result);
-
-  // Clears expired pages if there are any.
+  // Clears expired pages if there are any or we're running out of storage.
   void ClearStorageIfNeeded(
       const OfflinePageStorageManager::ClearStorageCallback& callback);
 
   // Callback completing storage clearing.
-  void OnStorageCleared(size_t expired_page_count,
+  void OnStorageCleared(size_t cleared_page_count,
                         OfflinePageStorageManager::ClearStorageResult result);
 
   // Post task to clear storage.
   void PostClearStorageIfNeededTask(bool delayed);
 
   // Check if |offline_page| should be removed on cache reset by user.
   bool IsRemovedOnCacheReset(const OfflinePageItem& offline_page) const;
 
   void RunWhenLoaded(const base::Closure& job);
 
@@ skipping 37 matching lines @@
   base::Clock* testing_clock_;
 
   base::WeakPtrFactory<OfflinePageModelImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModelImpl);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_