Split browsing data masks between content and embedder

chrome/browser/browsing_data/mock_browsing_data_remover.cc

Index: chrome/browser/browsing_data/mock_browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/mock_browsing_data_remover.cc b/chrome/browser/browsing_data/mock_browsing_data_remover.cc
index 0bf01cf3a5f5b47310cc9267aad77f4b0646b7c4..239c814147fe1a4384a6928923256135c8381beb 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_remover.cc
@@ -40,13 +40,19 @@ void MockBrowsingDataRemover::RemoveAndReply(const base::Time& delete_begin,
                  observer);
 }
 
+bool MockBrowsingDataRemover::DoesOriginMatchMask(
+    int origin_type_mask,
+    const GURL& origin,
+    storage::SpecialStoragePolicy* special_storage_policy) const {
+  return true;
+}
+
 void MockBrowsingDataRemover::RemoveWithFilter(
     const base::Time& delete_begin,
     const base::Time& delete_end,
     int remove_mask,
     int origin_type_mask,
     std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder) {
-  DCHECK_EQ(0, remove_mask & ~FILTERABLE_DATATYPES);
   DCHECK(filter_builder);
   RemoveInternal(delete_begin, delete_end, remove_mask, origin_type_mask,
                  std::move(filter_builder), nullptr);
@@ -59,7 +65,6 @@ void MockBrowsingDataRemover::RemoveWithFilterAndReply(
     int origin_type_mask,
     std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder,
     Observer* observer) {
-  DCHECK_EQ(0, remove_mask & ~FILTERABLE_DATATYPES);
   DCHECK(filter_builder);
   DCHECK(observer);
   RemoveInternal(delete_begin, delete_end, remove_mask, origin_type_mask,