[Offline Pages] Don't remove user-requested pages when deleting cache.

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 57 matching lines @@
   void RemoveObserver(Observer* observer) override;
   void SavePage(const GURL& url,
                 const ClientId& client_id,
                 int64_t proposed_offline_id,
                 std::unique_ptr<OfflinePageArchiver> archiver,
                 const SavePageCallback& callback) override;
   void MarkPageAccessed(int64_t offline_id) override;
   void ClearAll(const base::Closure& callback) override;
   void DeletePagesByOfflineId(const std::vector<int64_t>& offline_ids,
                               const DeletePageCallback& callback) override;
-  void DeletePagesByURLPredicate(const UrlPredicate& predicate,
-                                 const DeletePageCallback& callback) override;
+  void DeleteCachedPagesByURLPredicate(
+      const UrlPredicate& predicate,
+      const DeletePageCallback& callback) override;
   void HasPages(const std::string& name_space,
                 const HasPagesCallback& 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,
@@ skipping 145 matching lines @@
       const std::vector<OfflinePageItem>& offline_pages);
 
   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);
 
   // Similar to DoDeletePagesByOfflineId, does actual work of deleting, and
   // requires that the model is loaded.
-  void DoDeletePagesByURLPredicate(const UrlPredicate& predicate,
-                                   const DeletePageCallback& callback);
+  void DoDeleteCachedPagesByURLPredicate(const UrlPredicate& predicate,
+                                         const DeletePageCallback& callback);
 
   // Callback completing page expiration.
   void OnExpirePageDone(int64_t offline_id,
                         const base::Time& expiration_time,
                         bool success);
 
   // 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.
   void PostClearStorageIfNeededTask();
 
+  // Check if |offline_page| is user-requested.
+  bool IsPageUserRequested(const OfflinePageItem& offline_page) const;
+
   void RunWhenLoaded(const base::Closure& job);
 
   // Persistent store for offline page metadata.
   std::unique_ptr<OfflinePageMetadataStore> store_;
 
   // Location where all of the archive files will be stored.
   base::FilePath archives_dir_;
 
   // The observers.
   base::ObserverList<Observer> observers_;
@@ skipping 23 matching lines @@
   OfflinePageModelEventLogger offline_event_logger_;
 
   base::WeakPtrFactory<OfflinePageModelImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModelImpl);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_