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

components/offline_pages/offline_page_model_impl.cc

 // 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.
 
 #include "components/offline_pages/offline_page_model_impl.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 361 matching lines @@
 
   std::vector<int64_t> offline_ids;
   for (const auto& id_page_pair : offline_pages_)
     offline_ids.push_back(id_page_pair.first);
   DeletePagesByOfflineId(
       offline_ids,
       base::Bind(&OfflinePageModelImpl::OnRemoveAllFilesDoneForClearAll,
                  weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
-void OfflinePageModelImpl::DeletePagesByURLPredicate(
+void OfflinePageModelImpl::DeleteCachedPagesByURLPredicate(
     const UrlPredicate& predicate,
     const DeletePageCallback& callback) {
-  RunWhenLoaded(base::Bind(&OfflinePageModelImpl::DoDeletePagesByURLPredicate,
-                           weak_ptr_factory_.GetWeakPtr(), predicate,
-                           callback));
+  RunWhenLoaded(
+      base::Bind(&OfflinePageModelImpl::DoDeleteCachedPagesByURLPredicate,
+                 weak_ptr_factory_.GetWeakPtr(), predicate, callback));
 }
 
-void OfflinePageModelImpl::DoDeletePagesByURLPredicate(
+void OfflinePageModelImpl::DoDeleteCachedPagesByURLPredicate(
     const UrlPredicate& predicate,
     const DeletePageCallback& callback) {
   DCHECK(is_loaded_);
 
   std::vector<int64_t> offline_ids;
   for (const auto& id_page_pair : offline_pages_) {
-    if (predicate.Run(id_page_pair.second.url))
+    if (!IsPageUserRequested(id_page_pair.second) &&
+        predicate.Run(id_page_pair.second.url))
       offline_ids.push_back(id_page_pair.first);
   }
   DoDeletePagesByOfflineId(offline_ids, callback);
 }
 
 void OfflinePageModelImpl::HasPages(const std::string& name_space,
                                     const HasPagesCallback& callback) {
   RunWhenLoaded(base::Bind(&OfflinePageModelImpl::HasPagesAfterLoadDone,
                            weak_ptr_factory_.GetWeakPtr(), name_space,
                            callback));
@@ skipping 645 matching lines @@
 }
 
 void OfflinePageModelImpl::PostClearStorageIfNeededTask() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OfflinePageModelImpl::ClearStorageIfNeeded,
                             weak_ptr_factory_.GetWeakPtr(),
                             base::Bind(&OfflinePageModelImpl::OnStorageCleared,
                                        weak_ptr_factory_.GetWeakPtr())));
 }
 
+bool OfflinePageModelImpl::IsPageUserRequested(

[fgorski, 2016/08/24 16:22:03]

IsUserRequestedPage

[romax, 2016/08/24 17:26:22]

Done.

+    const OfflinePageItem& offline_page) const {
+  return (offline_page.client_id.name_space == kAsyncNamespace ||
+          offline_page.client_id.name_space == kDownloadNamespace);
+}
+
 void OfflinePageModelImpl::RunWhenLoaded(const base::Closure& task) {
   if (!is_loaded_) {
     delayed_tasks_.push_back(task);
     return;
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task);
 }
 
 }  // namespace offline_pages