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

chrome/browser/browsing_data/mock_browsing_data_remover.h

Index: chrome/browser/browsing_data/mock_browsing_data_remover.h
diff --git a/chrome/browser/browsing_data/mock_browsing_data_remover.h b/chrome/browser/browsing_data/mock_browsing_data_remover.h
new file mode 100644
index 0000000000000000000000000000000000000000..f8284ddc6fa9de5397a2b926c02a757e916f0fae
--- /dev/null
+++ b/chrome/browser/browsing_data/mock_browsing_data_remover.h
@@ -0,0 +1,111 @@
+// 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_MOCK_BROWSING_DATA_REMOVER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_REMOVER_H_
+
+#include <list>
+
+#include "base/observer_list.h"
+#include "chrome/browser/browsing_data/browsing_data_remover_impl.h"
+#include "components/keyed_service/core/keyed_service.h"
+#include "testing/gtest/include/gtest/gtest.h"

[msramek, 2017/02/27 16:31:16]

Is this needed?

[dullweber, 2017/02/28 08:40:19]

only in the .cc for an EXPECT_EQ(), fixed

+
+// A BrowsingDataRemover that only records calls.

[msramek, 2017/02/27 16:31:16]

nit: Please explain that some of the methods are NOTIMPLEMENTED() since they're
not needed right now. People who only look at the .h file when including it
could possibly be surprised by that.

[dullweber, 2017/02/28 08:40:19]

Done.

+class MockBrowsingDataRemover : public BrowsingDataRemover,
+                                public KeyedService {
+ public:
+  explicit MockBrowsingDataRemover(content::BrowserContext* context);
+
+  ~MockBrowsingDataRemover() override;
+
+  void Shutdown() override;

[msramek, 2017/02/27 16:31:16]

style: Document what inherits from what. Typically the format is:

// BrowsingDataRemover:
void Remove() override;
void RemoveAndReply() override;
...

// KeyedService:
void Shutdown() override;

Note that there are typically no empty lines between methods from one parent
class (so that it's clear that the comments applies to all of them).

Document any public methods which are not inherited (e.g.
VerifyAndClearExpectations).

(I know that this is was my code, but at that time it was just a helper class
inside a test, not a standalone class in its own file)

Please also reorder the .cc file correspondingly.

[dullweber, 2017/02/28 08:40:19]

I added comments and removed empty lines.

+
+  void Remove(const base::Time& delete_begin,
+              const base::Time& delete_end,
+              int remove_mask,
+              int origin_type_mask) override;
+
+  void RemoveAndReply(const base::Time& delete_begin,
+                      const base::Time& delete_end,
+                      int remove_mask,
+                      int origin_type_mask,
+                      Observer* observer) override;
+
+  void 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) override;
+
+  void 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) 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,
+      Observer* observer);
+
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
+
+  const base::Time& GetLastUsedBeginTime() override;
+  const base::Time& GetLastUsedEndTime() override;
+  int GetLastUsedRemovalMask() override;
+  int GetLastUsedOriginTypeMask() override;
+  void SetEmbedderDelegate(
+      std::unique_ptr<BrowsingDataRemoverDelegate> embedder_delegate) override;
+  BrowsingDataRemoverDelegate* GetEmbedderDelegate() const 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_MOCK_BROWSING_DATA_REMOVER_H_