[Offline Pages] Removing client in storage manager.

components/offline_pages/offline_page_model.h

 // Copyright 2015 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_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/supports_user_data.h"
 #include "components/offline_pages/offline_page_archiver.h"
 #include "components/offline_pages/offline_page_storage_manager.h"
 #include "components/offline_pages/offline_page_types.h"
 
 class GURL;
 namespace base {
 class Time;
 }  // namespace base
 
 namespace offline_pages {
 
 static const char* const kBookmarkNamespace = "bookmark";
+static const char* const kLastNNamespace = "last_n";

[dougarnett, 2016/06/01 01:41:11]

Btw, i was hoping we could get these constants out of this file into some
unknown-to-me better home. But good to keep them together for now.

[chili, 2016/06/01 03:54:37]

Jian's CL (https://codereview.chromium.org/2022283003/) moved these out to a
different constants file I think...

[jianli, 2016/06/01 20:41:21]

Yes, please wait and sync after my patch (need to merge to M52) gets landed.

[romax, 2016/06/01 20:58:43]

Is this the one to wait for? Or what's the CL number of the one I should wait?
https://codereview.chromium.org/2022283003/

 static const int64_t kInvalidOfflineId = 0;
 
 struct ClientId;
 struct OfflinePageItem;
 
 // Service for saving pages offline, storing the offline copy and metadata, and
 // retrieving them upon request.
 //
 // Example usage:
 //   class ArchiverImpl : public OfflinePageArchiver {
 //     // This is a class that knows how to create archiver
 //     void CreateArchiver(...) override;
 //     ...
 //   }
 //
 //   // In code using the OfflinePagesModel to save a page:
 //   std::unique_ptr<ArchiverImpl> archiver(new ArchiverImpl());
 //   // Callback is of type SavePageCallback.
 //   model->SavePage(url, std::move(archiver), callback);
 //
 // TODO(fgorski): Things to describe:
 // * how to cancel requests and what to expect
-class OfflinePageModel : public base::SupportsUserData,
-                         public OfflinePageStorageManager::Client {
+class OfflinePageModel : public base::SupportsUserData {
  public:
   // Observer of the OfflinePageModel.
   class Observer {
    public:
     // Invoked when the model has finished loading.
     virtual void OfflinePageModelLoaded(OfflinePageModel* model) = 0;
 
     // Invoked when the model is being updated, due to adding, removing or
     // updating an offline page.
     virtual void OfflinePageModelChanged(OfflinePageModel* model) = 0;
@@ skipping 32 matching lines @@
   virtual void SavePage(const GURL& url,
                         const ClientId& client_id,
                         std::unique_ptr<OfflinePageArchiver> archiver,
                         const SavePageCallback& callback) = 0;
 
   // Marks that the offline page related to the passed |offline_id| has been
   // accessed. Its access info, including last access time and access count,
   // will be updated. Requires that the model is loaded.
   virtual void MarkPageAccessed(int64_t offline_id) = 0;
 
-  // TODO(romax): Pull this interface up from OfflinePageStorageManager::Client
-  // void DeletePagesByOfflineId(const std::vector<int64_t>& offline_ids,
-  //                             const DeletePageCallback& callback);
-
   // Wipes out all the data by deleting all saved files and clearing the store.
   virtual void ClearAll(const base::Closure& callback) = 0;
 
+  // Deletes pages based on |ofline_ids|.
+  virtual void DeletePagesByOfflineId(const std::vector<int64_t>& offline_ids,
+                                      const DeletePageCallback& callback) = 0;
+
   // Deletes offline pages matching the URL predicate.
   virtual void DeletePagesByURLPredicate(
       const UrlPredicate& predicate,
       const DeletePageCallback& callback) = 0;
 
   // Returns true via callback if there are offline pages in the given
   // |name_space|.
   virtual void HasPages(const std::string& name_space,
                         const HasPagesCallback& callback) = 0;
 
   // Returns via callback all GURLs in |urls| that are equal to the online URL
   // of any offline page.
   virtual void CheckPagesExistOffline(
       const std::set<GURL>& urls,
       const CheckPagesExistOfflineCallback& callback) = 0;
 
+  // Gets all offline pages.
+  virtual void GetAllPages(const MultipleOfflinePageItemCallback& callback) = 0;

[jianli, 2016/06/01 20:41:21]

Please add const modifier.

[romax, 2016/06/01 20:58:44]

i'm not sure where to add a const?

[jianli, 2016/06/01 20:59:37]

virtual void GetAllPages(const MultipleOfflinePageItemCallback& callback) const
= 0;

+
   // Gets all offline ids where the offline page has the matching client id.
   virtual void GetOfflineIdsForClientId(
       const ClientId& client_id,
       const MultipleOfflineIdCallback& callback) = 0;
 
   // Gets all offline ids where the offline page has the matching client id.
   // Requires that the model is loaded.  May not return matching IDs depending
   // on the internal state of the model.
   //
   // This function is deprecated.  Use |GetOfflineIdsForClientId| instead.
@@ skipping 43 matching lines @@
   // not found.  See |GetBestPageForOnlineURL| for selection criteria.
   virtual const OfflinePageItem* MaybeGetBestPageForOnlineURL(
       const GURL& online_url) const = 0;
 
   // Checks that all of the offline pages have corresponding offline copies.
   // If a page is discovered to be missing an offline copy, its offline page
   // metadata will be removed and |OfflinePageDeleted| will be sent to model
   // observers.
   virtual void CheckForExternalFileDeletion() = 0;
 
+  // Marks pages with |offline_ids| as expired and delete the associated archive

[jianli, 2016/06/01 20:41:21]

nit: deletes

[romax, 2016/06/01 20:58:43]

Done.

+  // files.
+  virtual void ExpirePages(const std::vector<int64_t>& offline_ids,
+                           const base::Time& expiration_time,
+                           const base::Callback<void(bool)>& callback) = 0;
+
   // Returns the policy controller.
   virtual ClientPolicyController* GetPolicyController() = 0;
 
   // TODO(dougarnett): Remove this and its uses.
   virtual bool is_loaded() const = 0;
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_