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

chrome/browser/browsing_data/browsing_data_remover.h

Index: chrome/browser/browsing_data/browsing_data_remover.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 7ff741203547fea3fa39f751bd7542742b69419e..be3322e4fcd4eae448a3f41ab4dc3c5b69d89402 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -36,6 +36,7 @@
 #endif
 
 class BrowsingDataRemoverFactory;
+class OriginFilterBuilder;
 class IOThread;
 class Profile;
 
@@ -247,6 +248,16 @@ class BrowsingDataRemover : public KeyedService
               int remove_mask,
               int origin_type_mask);
 
+
+  // Removes the specified items related to browsing for all origins that match
+  // the provided |origin_type_mask| (see BrowsingDataHelper::OriginTypeMask).
+  // The |origin_filter| is used as a final filter for clearing operations.
+  // TODO(dmurph): Support all backends with filter (crbug.com/589586).
+  void RemoveWithFilter(const TimeRange& time_range,
+                        int remove_mask,
+                        int origin_type_mask,
+                        const OriginFilterBuilder& origin_filter);
+
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
@@ -300,14 +311,15 @@ class BrowsingDataRemover : public KeyedService
 
   // Removes the specified items related to browsing for a specific host. If the
   // provided |remove_url| is empty, data is removed for all origins; otherwise,
-  // it is restricted by origin (where implemented yet). The
+  // it is restricted by the origin filter origin (where implemented yet). The
   // |origin_type_mask| parameter defines the set of origins from which data
   // should be removed (protected, unprotected, or both).
   // TODO(ttr314): Remove "(where implemented yet)" constraint above once
   // crbug.com/113621 is done.
+  // TODO(crbug.com/589586): Support all backends w/ origin filter.
   void RemoveImpl(const TimeRange& time_range,
                   int remove_mask,
-                  const GURL& remove_url,
+                  const OriginFilterBuilder& origin_filter,
                   int origin_type_mask);
 
   // Notifies observers and transitions to the idle state.