Support the Clear-Site-Data header on resource requests

content/public/test/mock_browsing_data_remover_delegate.cc

Index: content/public/test/mock_browsing_data_remover_delegate.cc
diff --git a/chrome/browser/browsing_data/mock_browsing_data_remover_delegate.cc b/content/public/test/mock_browsing_data_remover_delegate.cc
similarity index 75%
rename from chrome/browser/browsing_data/mock_browsing_data_remover_delegate.cc
rename to content/public/test/mock_browsing_data_remover_delegate.cc
index 9c3e6e5f29aa86facccc6f648d3310547df419bf..4183749a8feb7845a61cd400e8d6f844e3f07933 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_remover_delegate.cc
+++ b/content/public/test/mock_browsing_data_remover_delegate.cc
@@ -2,21 +2,23 @@
 // 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_delegate.h"
+#include "content/public/test/mock_browsing_data_remover_delegate.h"
 
 #include "base/callback.h"
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace content {
+
 MockBrowsingDataRemoverDelegate::MockBrowsingDataRemoverDelegate() {}
 
 MockBrowsingDataRemoverDelegate::~MockBrowsingDataRemoverDelegate() {
   DCHECK(!expected_calls_.size()) << "Expectations were set but not verified.";
 }
 
-content::BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher
+BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher
 MockBrowsingDataRemoverDelegate::GetOriginTypeMatcher() const {
-  return content::BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher();
+  return BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher();
 }
 
 bool MockBrowsingDataRemoverDelegate::MayRemoveDownloadHistory() const {
@@ -27,7 +29,7 @@ void MockBrowsingDataRemoverDelegate::RemoveEmbedderData(
     const base::Time& delete_begin,
     const base::Time& delete_end,
     int remove_mask,
-    const content::BrowsingDataFilterBuilder& filter_builder,
+    const BrowsingDataFilterBuilder& filter_builder,
     int origin_type_mask,
     const base::Closure& callback) {
   actual_calls_.emplace_back(delete_begin, delete_end, remove_mask,
@@ -41,7 +43,7 @@ void MockBrowsingDataRemoverDelegate::ExpectCall(
     const base::Time& delete_end,
     int remove_mask,
     int origin_type_mask,
-    const content::BrowsingDataFilterBuilder& filter_builder) {
+    const BrowsingDataFilterBuilder& filter_builder) {
   expected_calls_.emplace_back(delete_begin, delete_end, remove_mask,
                                origin_type_mask, filter_builder.Copy(),
                                true /* should_compare_filter */);
@@ -54,13 +56,24 @@ void MockBrowsingDataRemoverDelegate::ExpectCallDontCareAboutFilterBuilder(
     int origin_type_mask) {
   expected_calls_.emplace_back(
       delete_begin, delete_end, remove_mask, origin_type_mask,
-      content::BrowsingDataFilterBuilder::Create(
-          content::BrowsingDataFilterBuilder::BLACKLIST),
+      BrowsingDataFilterBuilder::Create(BrowsingDataFilterBuilder::BLACKLIST),
       false /* should_compare_filter */);
 }
 
 void MockBrowsingDataRemoverDelegate::VerifyAndClearExpectations() {
-  EXPECT_EQ(expected_calls_, actual_calls_);
+  EXPECT_EQ(expected_calls_.size(), actual_calls_.size())
+      << expected_calls_.size() << " calls were expected, but "
+      << actual_calls_.size() << " were made.";
+
+  if (expected_calls_.size() == actual_calls_.size()) {
+    auto actual = actual_calls_.begin();
+    int count = 0;
+    for (auto expected = expected_calls_.begin();
+         expected != expected_calls_.end(); expected++, actual++, count++) {
+      EXPECT_EQ(*expected, *actual) << "Call #" << count << " differs.";
+    }
+  }
+
   expected_calls_.clear();
   actual_calls_.clear();
 }
@@ -70,7 +83,7 @@ MockBrowsingDataRemoverDelegate::CallParameters::CallParameters(
     const base::Time& delete_end,
     int remove_mask,
     int origin_type_mask,
-    std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder,
+    std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
     bool should_compare_filter)
     : delete_begin_(delete_begin),
       delete_end_(delete_end),
@@ -96,3 +109,5 @@ bool MockBrowsingDataRemoverDelegate::CallParameters::operator==(
     return true;
   return *a.filter_builder_ == *b.filter_builder_;
 }
+
+}  // content