Split browsing data masks between content and embedder

chrome/browser/browsing_data/mock_browsing_data_remover.cc

 // Copyright 2017 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 "chrome/browser/browsing_data/mock_browsing_data_remover.h"
 
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 22 matching lines @@
                                              const base::Time& delete_end,
                                              int remove_mask,
                                              int origin_type_mask,
                                              Observer* observer) {
   DCHECK(observer);
   RemoveInternal(delete_begin, delete_end, remove_mask, origin_type_mask,
                  std::unique_ptr<content::BrowsingDataFilterBuilder>(),
                  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);
 }
 
 void MockBrowsingDataRemover::RemoveWithFilterAndReply(
     const base::Time& delete_begin,
     const base::Time& delete_end,
     int remove_mask,
     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,
                  std::move(filter_builder), observer);
 }
 
 void MockBrowsingDataRemover::RemoveInternal(
     const base::Time& delete_begin,
     const base::Time& delete_end,
     int remove_mask,
@@ skipping 99 matching lines @@
   if (a.delete_begin_ != b.delete_begin_ || a.delete_end_ != b.delete_end_ ||
       a.remove_mask_ != b.remove_mask_ ||
       a.origin_type_mask_ != b.origin_type_mask_) {
     return false;
   }
 
   if (!a.should_compare_filter_ || !b.should_compare_filter_)
     return true;
   return *a.filter_builder_ == *b.filter_builder_;
 }