Query API: Introduces an OfflinePageModelQuery object.

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 102 matching lines @@
   OfflineEventLogger* GetLogger() override;
 
  protected:
   // Adding a protected constructor for testing-only purposes in
   // offline_page_storage_manager_unittest.cc
   OfflinePageModelImpl();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(OfflinePageModelImplTest, MarkPageForDeletion);
 
   enum class GetAllPageMode {

[fgorski, 2016/10/26 18:05:41]

remove?

[dewittj, 2016/10/27 22:49:17]

Done.

     ALL,               // Get all active page entries.
     ALL_WITH_EXPIRED,  // Get all pages entries including expired ones.
   };
 
   typedef ScopedVector<OfflinePageArchiver> PendingArchivers;
 
+  void ExecuteQuery(std::unique_ptr<OfflinePageModelQuery> query,
+                    const MultipleOfflinePageItemCallback& callback);
+
   // Callback for ensuring archive directory is created.
   void OnEnsureArchivesDirCreatedDone(const base::TimeTicks& start_time);
 
-  void GetAllPagesAfterLoadDone(
-      GetAllPageMode mode,
-      const MultipleOfflinePageItemCallback& callback) const;
   void CheckPagesExistOfflineAfterLoadDone(
       const std::set<GURL>& urls,
       const CheckPagesExistOfflineCallback& callback);
   void GetOfflineIdsForClientIdWhenLoadDone(
       const ClientId& client_id,
       const MultipleOfflineIdCallback& callback) const;
   void GetPageByOfflineIdWhenLoadDone(
       int64_t offline_id,
       const SingleOfflinePageItemCallback& callback) const;
   const std::vector<int64_t> MaybeGetOfflineIdsForClientId(
       const ClientId& client_id) const;
-  const OfflinePageItem* MaybeGetPageByOfflineId(int64_t offline_id) const;
   void GetPagesByOnlineURLWhenLoadDone(
       const GURL& online_url,
       const MultipleOfflinePageItemCallback& callback) const;
   void MarkPageAccessedWhenLoadDone(int64_t offline_id);
 
   void CheckMetadataConsistency();
 
   // Callback for loading pages from the offline page metadata store.
   void OnLoadDone(const base::TimeTicks& start_time,
                   OfflinePageMetadataStore::LoadStatus load_status,
@@ skipping 56 matching lines @@
                                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 DoDeletePagesByClientIds(const std::vector<ClientId>& client_ids,
-                                const DeletePageCallback& callback);
+  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.
@@ skipping 56 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_