Add removal filter support for Cookies, Storage, and Content Settings.

components/offline_pages/offline_page_model.cc

 // 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.
 
 #include "components/offline_pages/offline_page_model.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 270 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(&OfflinePageModel::OnRemoveAllFilesDoneForClearAll,
                  weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
+void OfflinePageModel::ClearWithURLPredicate(
+    const base::Callback<bool(const GURL&)> predicate,
+    const base::Closure& callback) {
+  DCHECK(is_loaded_);

[fgorski, 2016/04/07 17:02:49]

You can push back to delayed tasks here if you want this to take effect once the
model is loaded. See implementation of DeletePagesByOfflineId.

[dmurph, 2016/04/08 23:33:45]

Done.

+
+  std::vector<int64_t> offline_ids;
+  for (const auto& id_page_pair : offline_pages_) {
+    if (predicate.Run(GURL(id_page_pair.second.url)))

[fgorski, 2016/04/07 17:02:49]

id_page_pair.second.url is already a GURL.

Another thing is: Some of the pages might have already been marked for deletion.
Which means they are only temporarily hanging around (in case someone tries to
undo deleting a bookmark.

Given it is extremely unlikely someone will get a chance to undelete a bookmark
after clearing site data, I think the risk is small, but I'd filter out pages
marked for deletion here:

if (predicate.Run(id_page_pair.second.url) &&
!id_page_pair.second.IsMarkedForDeletion())

[dmurph, 2016/04/08 23:33:45]

Done.

+      offline_ids.push_back(id_page_pair.first);
+  }
+  DeletePagesByOfflineId(
+      offline_ids,
+      base::Bind(&OfflinePageModel::OnRemoveAllFilesDoneForClearAll,

[fgorski, 2016/04/07 17:02:49]

No this will not do, as this wipes the whole store, which I am sure you don't
want to do if you selectively remove some pages.

I don't think you have extra clean up tasks after you delete here. This should
be enough:

DeletePagesByOfflineId(offline_ids, callback);

[dmurph, 2016/04/08 23:33:45]

Whoops, thanks.

+                 weak_ptr_factory_.GetWeakPtr(), callback));
+}
+
 bool OfflinePageModel::HasOfflinePages() const {
   // Since offline pages feature is enabled by default,
   // NetErrorTabHelper::SetHasOfflinePages might call this before the model is
   // fully loaded. To address this, we need to switch to asynchonous model
   // (crbug.com/589526). But for now, we just bail out to work around the test
   // issue.
   if (!is_loaded_)
     return false;
 
   // Check that at least one page is not marked for deletion. Because we have
@@ skipping 487 matching lines @@
           base::Bind(&OfflinePageModel::MarkPageForDeletion,
                      weak_ptr_factory_.GetWeakPtr(), offline_ids[i], callback));
     }
     return;
   }
   for (const auto& id : offline_ids) {
     MarkPageForDeletion(id, callback);
   }
 }
 }  // namespace offline_pages