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

net/cookies/cookie_store.h

 // Copyright (c) 2012 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.
 
 // Brought to you by number 42.
 
 #ifndef NET_COOKIES_COOKIE_STORE_H_
 #define NET_COOKIES_COOKIE_STORE_H_
 
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 
 class GURL;
 
 namespace net {
@@ skipping 12 matching lines @@
   // Callback definitions.
   typedef base::Callback<void(const CookieList& cookies)> GetCookieListCallback;
   typedef base::Callback<void(const std::string& cookie)> GetCookiesCallback;
   typedef base::Callback<void(bool success)> SetCookiesCallback;
   typedef base::Callback<void(int num_deleted)> DeleteCallback;
   typedef base::Callback<void(const CanonicalCookie& cookie, bool removed)>
       CookieChangedCallback;
   typedef base::CallbackList<void(const CanonicalCookie& cookie, bool removed)>
       CookieChangedCallbackList;
   typedef CookieChangedCallbackList::Subscription CookieChangedSubscription;
+  typedef base::Callback<bool(const CanonicalCookie& cookie)> CookiePredicate;
 
   virtual ~CookieStore();
 
   // Returns the cookie line (e.g. "cookie1=value1; cookie2=value2") represented
   // by |cookies|. The string is built in the same order as the given list.
   //
   // TODO(mkwst): We really should standardize on either
   // 'std::vector<CanonicalCookie>' or 'std::vector<CanonicalCookie*>'.
   static std::string BuildCookieLine(
       const std::vector<CanonicalCookie>& cookies);
@@ skipping 98 matching lines @@
   virtual void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin,
                                             const base::Time& delete_end,
                                             const DeleteCallback& callback) = 0;
 
   // Deletes all of the cookies that match the host of the given URL
   // regardless of path and that have a creation_date greater than or
   // equal to |delete_begin| and less then |delete_end|. This includes
   // all http_only and secure cookies, but does not include any domain
   // cookies that may apply to this host.
   // Returns the number of cookies deleted.
   virtual void DeleteAllCreatedBetweenForHostAsync(

[Mike West, 2016/03/11 08:36:11]

Do we still need this if we have the method you're adding? I'd prefer not to
have two mechanisms for doing the same thing, as there's so much boilerplate
involved.

In fact, it might make sense to split the cookie bits off from the rest of this
CL, first replacing this method with the predicated-based deletion mechanism,
then expanding the usage.

[dmurph, 2016/03/30 22:21:27]

Hmmm... yeah I could do this. I'll put my new patch up w/ these changes for now,
but I can copy them into a new CL.

       const base::Time delete_begin,
       const base::Time delete_end,
       const GURL& url,
       const DeleteCallback& callback) = 0;
 
+  // Deletes all of the cookies that match the given predicate and that have a
+  // creation_date greater than or equal to |delete_begin| and less then
+  // |delete_end|. Make sure you know what you are doing here so you don't break
+  // the web.
+  // Returns the number of cookies deleted.

[Mike West, 2016/03/11 08:36:11]

It calls |callback| with the number of cookies deleted, right? Would you mind
changing this in the two previous comments as well?

[dmurph, 2016/03/30 22:21:27]

Done.

+  virtual void DeleteAllCreatedBetweenWithPredicateAsync(
+      const base::Time& delete_begin,
+      const base::Time& delete_end,
+      const CookiePredicate& predicate,
+      const DeleteCallback& callback) = 0;
+
   virtual void DeleteSessionCookiesAsync(const DeleteCallback&) = 0;
 
   // Deletes all cookies in the store.
   void DeleteAllAsync(const DeleteCallback& callback);
 
   // Flush the backing store (if any) to disk and post the given callback when
   // done.
   virtual void FlushStore(const base::Closure& callback) = 0;
 
   // Protects session cookies from deletion on shutdown, if the underlying
@@ skipping 22 matching lines @@
       const std::string& name,
       const CookieChangedCallback& callback) = 0;
 
  protected:
   CookieStore();
 };
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_STORE_H_