Support the Clear-Site-Data header on resource requests

content/public/test/mock_browsing_data_remover_delegate.h

Index: content/public/test/mock_browsing_data_remover_delegate.h
diff --git a/chrome/browser/browsing_data/mock_browsing_data_remover_delegate.h b/content/public/test/mock_browsing_data_remover_delegate.h
similarity index 65%
rename from chrome/browser/browsing_data/mock_browsing_data_remover_delegate.h
rename to content/public/test/mock_browsing_data_remover_delegate.h
index dc960f56bb03ef750ee79bc7e4e21683e387c73b..ca715006f94af7617bae12a0765de78c79dc08f3 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_remover_delegate.h
+++ b/content/public/test/mock_browsing_data_remover_delegate.h
@@ -12,31 +12,31 @@
 #include "content/public/browser/browsing_data_filter_builder.h"
 #include "content/public/browser/browsing_data_remover_delegate.h"
 
+namespace content {
+
 // A BrowsingDataRemoverDelegate that only records RemoveEmbedderData() calls.
-class MockBrowsingDataRemoverDelegate
-    : public content::BrowsingDataRemoverDelegate {
+class MockBrowsingDataRemoverDelegate : public BrowsingDataRemoverDelegate {
  public:
   MockBrowsingDataRemoverDelegate();
   ~MockBrowsingDataRemoverDelegate() override;
 
   // BrowsingDataRemoverDelegate:
-  content::BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher
-  GetOriginTypeMatcher() const override;
+  BrowsingDataRemoverDelegate::EmbedderOriginTypeMatcher GetOriginTypeMatcher()
+      const override;
   bool MayRemoveDownloadHistory() const override;
-  void RemoveEmbedderData(
-      const base::Time& delete_begin,
-      const base::Time& delete_end,
-      int remove_mask,
-      const content::BrowsingDataFilterBuilder& filter_builder,
-      int origin_type_mask,
-      const base::Closure& callback) override;
+  void RemoveEmbedderData(const base::Time& delete_begin,
+                          const base::Time& delete_end,
+                          int remove_mask,
+                          const BrowsingDataFilterBuilder& filter_builder,
+                          int origin_type_mask,
+                          const base::Closure& callback) override;
 
   // Add an expected call for testing.
   void ExpectCall(const base::Time& delete_begin,
                   const base::Time& delete_end,
                   int remove_mask,
                   int origin_type_mask,
-                  const content::BrowsingDataFilterBuilder& filter_builder);
+                  const BrowsingDataFilterBuilder& filter_builder);
 
   // Add an expected call that doesn't have to match the filter_builder.
   void ExpectCallDontCareAboutFilterBuilder(const base::Time& delete_begin,
@@ -50,13 +50,12 @@ class MockBrowsingDataRemoverDelegate
  private:
   class CallParameters {
    public:
-    CallParameters(
-        const base::Time& delete_begin,
-        const base::Time& delete_end,
-        int remove_mask,
-        int origin_type_mask,
-        std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder,
-        bool should_compare_filter);
+    CallParameters(const base::Time& delete_begin,
+                   const base::Time& delete_end,
+                   int remove_mask,
+                   int origin_type_mask,
+                   std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
+                   bool should_compare_filter);
     ~CallParameters();
 
     bool operator==(const CallParameters& other) const;
@@ -66,7 +65,7 @@ class MockBrowsingDataRemoverDelegate
     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_;
   };
 
@@ -74,4 +73,6 @@ class MockBrowsingDataRemoverDelegate
   std::list<CallParameters> expected_calls_;
 };
 
+}  // content
+
 #endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_REMOVER_DELEGATE_H_