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

content/public/browser/storage_partition.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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_
 #define CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
+#include "net/cookies/cookie_store.h"
 
 class GURL;
 
 namespace base {
 class Time;
 }
 
 namespace storage {
 class FileSystemContext;
 }
@@ skipping 94 matching lines @@
                                   const GURL& storage_origin,
                                   net::URLRequestContextGetter* rq_context,
                                   const base::Closure& callback) = 0;
 
   // A callback type to check if a given origin matches a storage policy.
   // Can be passed empty/null where used, which means the origin will always
   // match.
   typedef base::Callback<bool(const GURL&, storage::SpecialStoragePolicy*)>
       OriginMatcherFunction;
 
+  // A callback type to check if a given cookie should be cleared.
+  using CookieMatcherFunction = net::CookieStore::ClearCookiesPredicate;

[michaeln, 2016/03/09 20:25:51]

CookieMatcherFunction is a clearer and more broadly applicable name than
ClearCookiesPredicate, maybe that should be the name used in the net lib too?

[dmurph, 2016/03/10 23:00:11]

mmmmmm I like the word Predicate because that's exactly what this function is
(true/false from a value). I'll change the name of the function so it doesn't
have "Clear", but I think I'd like to keep the function names the same, unless
other people have more objections.

I used CookieMatcherFunction here to match the OriginMatcherFunction words.

+
   // Similar to ClearDataForOrigin().
-  // Deletes all data out fo the StoragePartition if |storage_origin| is
-  // nullptr.
+  // Deletes all data out for the StoragePartition if |storage_origin| is empty.
   // |origin_matcher| is present if special storage policy is to be handled,
   // otherwise the callback can be null (base::Callback::is_null() == true).
   // |callback| is called when data deletion is done or at least the deletion is
   // scheduled.
   virtual void ClearData(uint32_t remove_mask,
                          uint32_t quota_storage_remove_mask,
                          const GURL& storage_origin,
                          const OriginMatcherFunction& origin_matcher,

[michaeln, 2016/03/09 20:25:51]

Not new to this cl, this one is a little confusing, a storage_origin and
origin_matcher as inputs? What if an storage_origin is not empty and it fails
the matching function, what happens? Might be nice to clarify that in the doc
comments.

[dmurph, 2016/03/10 23:00:11]

They are used by different subsystems. I clarified a bit.

                          const base::Time begin,
                          const base::Time end,
                          const base::Closure& callback) = 0;
 
+  // Similar to ClearData().
+  // Deletes all data out for the StoragePartition.
+  // * |origin_matcher| is present if special storage policy is to be handled,
+  //   otherwise the callback should be null (base::Callback::is_null()==true).
+  //   The origin matcher does not apply to cookies, instead use:
+  // * |cookies_matcher| is present if special cookie clearing is to be handled.
+  //   If the callback is null all cookies withing the time range will be
+  //   cleared.
+  // * |callback| is called when data deletion is done or at least the deletion
+  //   is scheduled.
+  virtual void ClearData(uint32_t remove_mask,
+                         uint32_t quota_storage_remove_mask,
+                         const OriginMatcherFunction& origin_matcher,
+                         const CookieMatcherFunction& cookie_matcher,

[michaeln, 2016/03/09 20:25:51]

Hooray for punting to the higher level logic to sort thru the tea leaves of user
input indicating what to delete or keep!

[dmurph, 2016/03/10 23:00:11]

:)

+                         const base::Time begin,
+                         const base::Time end,
+                         const base::Closure& callback) = 0;
+
   // Write any unwritten data to disk.
   // Note: this method does not sync the data - it only ensures that any
   // unwritten data has been written out to the filesystem.
   virtual void Flush() = 0;
 
  protected:
   virtual ~StoragePartition() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_STORAGE_PARTITION_H_