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

chrome/browser/browsing_data/browsing_data_remover_mock.h

+// 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.
+
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_MOCK_H_

[msramek, 2017/02/27 14:22:41]

The file should be called the same way as the class: mock_browsing_data_remover.

[dullweber, 2017/02/27 16:04:11]

Done.

+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_MOCK_H_
+
+#include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+// 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 {

[msramek, 2017/02/27 14:22:41]

We should inherit from BrowsingDataRemover (the pure abstract class), since that
one will live in content/public/ and thus will be visible from chrome/. In that
case we can also resolve the TODO.

[dullweber, 2017/02/27 16:04:11]

I changed this class to inherit from the interface.

+ public:
+  explicit MockBrowsingDataRemover(content::BrowserContext* context);
+
+  ~MockBrowsingDataRemover() override;
+
+  void RemoveInternal(
+      const base::Time& delete_begin,
+      const base::Time& delete_end,
+      int remove_mask,
+      int origin_type_mask,
+      std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder,
+      BrowsingDataRemover::Observer* observer) override;
+
+  void ExpectCall(
+      const base::Time& delete_begin,
+      const base::Time& delete_end,
+      int remove_mask,
+      int origin_type_mask,
+      std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder);
+
+  void ExpectCallDontCareAboutFilterBuilder(const base::Time& delete_begin,
+                                            const base::Time& delete_end,
+                                            int remove_mask,
+                                            int origin_type_mask);
+
+  void VerifyAndClearExpectations();
+
+ 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();
+
+    bool operator==(const CallParameters& other) const;
+
+   private:
+    base::Time delete_begin_;
+    base::Time delete_end_;
+    int remove_mask_;
+    int origin_type_mask_;
+    std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder_;
+    bool should_compare_filter_;
+  };
+
+  std::list<CallParameters> actual_calls_;
+  std::list<CallParameters> expected_calls_;
+};
+
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_MOCK_H_