Extract MockBrowsingDataRemover to separate file to make it possible to use it

chrome/browser/chrome_content_browser_client_unittest.cc

Index: chrome/browser/chrome_content_browser_client_unittest.cc
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index d70e22d4f7846e3039cc73a4522310c392e733c7..70725c83a6e5e8b5858b0f754298c47169c571c4 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -19,7 +19,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
-#include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_remover.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -343,113 +343,6 @@ TEST_F(InstantNTPURLRewriteTest, UberURLHandler_InstantExtendedNewTabPage) {
 
 namespace {
 
-// A BrowsingDataRemover that only records calls.
-// TODO(msramek): Once BrowsingDataRemoverImpl moves to content/ (non-public),
-// it will not be possible to inherit from it here. However, at that time
-// this functionality will become redundant, as it will no longer be necessary
-// to call to chrome/ to perform deletion. Remove it then.
-class MockBrowsingDataRemover : public BrowsingDataRemoverImpl {
- public:
-  explicit MockBrowsingDataRemover(content::BrowserContext* context)
-      : BrowsingDataRemoverImpl(context) {}
-
-  ~MockBrowsingDataRemover() override {
-    DCHECK(!expected_calls_.size())
-        << "Expectations were set but not verified.";
-  }
-
-  void RemoveInternal(const base::Time& delete_begin,
-                      const base::Time& delete_end,
-                      int remove_mask,
-                      int origin_type_mask,
-                      std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
-                      BrowsingDataRemover::Observer* observer) override {
-    actual_calls_.emplace_back(delete_begin, delete_end, remove_mask,
-                               origin_type_mask, std::move(filter_builder),
-                               true /* should_compare_filter */);
-
-    // |observer| is not recorded in |actual_calls_| to be compared with
-    // expectations, because it's created internally in ClearSiteData() and
-    // it's unknown to this. However, it is tested implicitly, because we use
-    // it for the completion callback, so an incorrect |observer| will fail
-    // the test by waiting for the callback forever.
-    DCHECK(observer);
-    observer->OnBrowsingDataRemoverDone();
-  }
-
-  void ExpectCall(
-      const base::Time& delete_begin,
-      const base::Time& delete_end,
-      int remove_mask,
-      int origin_type_mask,
-      std::unique_ptr<BrowsingDataFilterBuilder> filter_builder) {
-    expected_calls_.emplace_back(delete_begin, delete_end, remove_mask,
-                                 origin_type_mask, std::move(filter_builder),
-                                 true /* should_compare_filter */);
-  }
-
-  void ExpectCallDontCareAboutFilterBuilder(const base::Time& delete_begin,
-                                            const base::Time& delete_end,
-                                            int remove_mask,
-                                            int origin_type_mask) {
-    expected_calls_.emplace_back(delete_begin, delete_end, remove_mask,
-                                 origin_type_mask,
-                                 std::unique_ptr<BrowsingDataFilterBuilder>(),
-                                 false /* should_compare_filter */);
-  }
-
-  void VerifyAndClearExpectations() {
-    EXPECT_EQ(expected_calls_, actual_calls_);
-    expected_calls_.clear();
-    actual_calls_.clear();
-  }
-
- 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<BrowsingDataFilterBuilder> filter_builder,
-                   bool should_compare_filter)
-        : delete_begin_(delete_begin),
-          delete_end_(delete_end),
-          remove_mask_(remove_mask),
-          origin_type_mask_(origin_type_mask),
-          filter_builder_(std::move(filter_builder)),
-          should_compare_filter_(should_compare_filter) {}
-    ~CallParameters() {}
-
-    bool operator==(const CallParameters& other) const {
-      const CallParameters& a = *this;
-      const CallParameters& b = other;
-
-      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_;
-    }
-
-   private:
-    base::Time delete_begin_;
-    base::Time delete_end_;
-    int remove_mask_;
-    int origin_type_mask_;
-    std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_;
-    bool should_compare_filter_;
-  };
-
-  std::list<CallParameters> actual_calls_;
-  std::list<CallParameters> expected_calls_;
-};
-
 // Tests for ChromeContentBrowserClient::ClearSiteData().
 class ChromeContentBrowserClientClearSiteDataTest : public testing::Test {
  public: