[Offline pages] Updating the UpdateCallback in OPMStoreSQL

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 32 matching lines @@
 
 namespace offline_pages {
 
 static const int64_t kInvalidOfflineId = 0;
 
 struct ClientId;
 struct OfflinePageItem;
 
 class ArchiveManager;
 class ClientPolicyController;
-class OfflinePageMetadataStore;
 class OfflinePageStorageManager;
 
 // Implementation of service for saving pages offline, storing the offline
 // copy and metadata, and retrieving them upon request.
 class OfflinePageModelImpl : public OfflinePageModel, public KeyedService {
  public:
   // All blocking calls/disk access will happen on the provided |task_runner|.
   OfflinePageModelImpl(
       std::unique_ptr<OfflinePageMetadataStore> store,
       const base::FilePath& archives_dir,
@@ skipping 109 matching lines @@
                            const SavePageCallback& callback,
                            OfflinePageArchiver* archiver,
                            OfflinePageArchiver::ArchiverResult result,
                            const GURL& url,
                            const base::FilePath& file_path,
                            const base::string16& title,
                            int64_t file_size);
   void OnAddOfflinePageDone(OfflinePageArchiver* archiver,
                             const SavePageCallback& callback,
                             const OfflinePageItem& offline_page,
-                            OfflinePageMetadataStore::ItemActionStatus status);
+                            ItemActionStatus status);
   void InformSavePageDone(const SavePageCallback& callback,
                           SavePageResult result,
                           const ClientId& client_id,
                           int64_t offline_id);
   void DeletePendingArchiver(OfflinePageArchiver* archiver);
 
   // Steps for deleting files and data for an offline page.
   void OnDeleteArchiveFilesDone(const std::vector<int64_t>& offline_ids,
                                 const DeletePageCallback& callback,
                                 bool success);
-  void OnRemoveOfflinePagesDone(const std::vector<int64_t>& offline_ids,
-                                const DeletePageCallback& callback,
-                                bool success);
+  void OnRemoveOfflinePagesDone(const DeletePageCallback& callback,
+                                std::unique_ptr<StoreUpdateResult> result);
   void InformDeletePageDone(const DeletePageCallback& callback,
                             DeletePageResult result);
 
   void OnMarkPageAccesseDone(const OfflinePageItem& offline_page_item,

[dewittj, 2016/09/23 17:21:36]

nit: spelling

-                             bool success);
+                             std::unique_ptr<StoreUpdateResult> result);
 
   // Callbacks for checking metadata consistency.
   void CheckMetadataConsistencyForArchivePaths(
       const std::set<base::FilePath>& archive_paths);
   // Callback called after headless archives deleted. Orphaned archives are
   // archives files on disk which are not pointed to by any of the page items
   // in metadata store.
   void ExpirePagesMissingArchiveFile(
       const std::set<base::FilePath>& archive_paths);
   void OnExpirePagesMissingArchiveFileDone(
@@ skipping 24 matching lines @@
   // Actually does the work of deleting, requires the model is loaded.
   void DoDeletePagesByOfflineId(const std::vector<int64_t>& offline_ids,
                                 const DeletePageCallback& 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 std::vector<OfflinePageItem>& expired_pages,
-                        const base::Time& expiration_time,
-                        bool success);
+  void OnExpirePageDone(const base::Time& expiration_time,
+                        std::unique_ptr<StoreUpdateResult> result);
 
   // Clears expired pages if there are any.
   void ClearStorageIfNeeded(
       const OfflinePageStorageManager::ClearStorageCallback& callback);
 
   // Callback completing storage clearing.
   void OnStorageCleared(size_t expired_page_count,
                         OfflinePageStorageManager::ClearStorageResult result);
 
   // Post task to clear storage.
@@ skipping 44 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_