Make BrowsingDataRemover mockable and filter builders comparable

chrome/browser/browsing_data/browsing_data_remover.h

 // Copyright (c) 2012 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_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 152 matching lines @@
     // The removal mask (see the RemoveDataMask enum for details).
     int removal_mask;
 
     // The origin type mask (see BrowsingDataHelper::OriginTypeMask for
     // details).
     int origin_type_mask;
   };
 
   struct TimeRange {
     TimeRange(base::Time begin, base::Time end) : begin(begin), end(end) {}
+    bool operator==(const TimeRange& other) const;
 
     base::Time begin;
     base::Time end;
   };
 
   // Observer is notified when the removal is done. Done means keywords have
   // been deleted, cache cleared and all other tasks scheduled.
   class Observer {
    public:
     virtual void OnBrowsingDataRemoverDone() = 0;
@@ skipping 51 matching lines @@
   void Remove(const TimeRange& time_range,
               int remove_mask,
               int origin_type_mask);
 
   // Removes the specified items related to browsing for all origins that match
   // the provided |origin_type_mask| (see BrowsingDataHelper::OriginTypeMask).
   // The |origin_filter| is used as a final filter for clearing operations.
   // TODO(dmurph): Support all backends with filter (crbug.com/113621).
   // DO NOT USE THIS METHOD UNLESS CALLER KNOWS WHAT THEY'RE DOING. NOT ALL
   // BACKENDS ARE SUPPORTED YET, AND MORE DATA THAN EXPECTED COULD BE DELETED.
-  void RemoveWithFilter(const TimeRange& time_range,
-                        int remove_mask,
-                        int origin_type_mask,
-                        const BrowsingDataFilterBuilder& origin_filter);
+  virtual void RemoveWithFilter(const TimeRange& time_range,
+                                int remove_mask,
+                                int origin_type_mask,
+                                const BrowsingDataFilterBuilder& origin_filter);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Used for testing.
   void OverrideStoragePartitionForTesting(
       content::StoragePartition* storage_partition);
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
   void OverrideWebappRegistryForTesting(
       std::unique_ptr<WebappRegistry> webapp_registry);
 #endif
 
+ protected:
+  // Use BrowsingDataRemoverFactory::GetForBrowserContext to get an instance of
+  // this class. The constructor is protected so that the class is mockable.
+  BrowsingDataRemover(content::BrowserContext* browser_context);
+  ~BrowsingDataRemover() override;
+
  private:
   // The clear API needs to be able to toggle removing_ in order to test that
   // only one BrowsingDataRemover instance can be called at a time.
   FRIEND_TEST_ALL_PREFIXES(ExtensionBrowsingDataTest, OneAtATime);
   // Testing our static method, ClearSettingsForOneTypeWithPredicate.
   FRIEND_TEST_ALL_PREFIXES(BrowsingDataRemoverTest, ClearWithPredicate);
 
   // The BrowsingDataRemover tests need to be able to access the implementation
   // of Remove(), as it exposes details that aren't yet available in the public
   // API. As soon as those details are exposed via new methods, this should be
   // removed.
   //
   // TODO(mkwst): See http://crbug.com/113621
   friend class BrowsingDataRemoverTest;
 
   friend class BrowsingDataRemoverFactory;
 
   // Clears all host-specific settings for one content type that satisfy the
   // given predicate.
   //
   // This should only be called on the UI thread.
   static void ClearSettingsForOneTypeWithPredicate(
       HostContentSettingsMap* content_settings_map,
       ContentSettingsType content_type,
       const base::Callback<
           bool(const ContentSettingsPattern& primary_pattern,
                const ContentSettingsPattern& secondary_pattern)>& predicate);
 
-  // Use BrowsingDataRemoverFactory::GetForBrowserContext to get an instance of
-  // this class.
-  BrowsingDataRemover(content::BrowserContext* browser_context);
-  ~BrowsingDataRemover() override;
-
   void Shutdown() override;
 
   // Setter for |is_removing_|; DCHECKs that we can only start removing if we're
   // not already removing, and vice-versa.
   void SetRemoving(bool is_removing);
 
   // Callback for when TemplateURLService has finished loading. Clears the data,
   // clears the respective waiting flag, and invokes NotifyIfDone.
   void OnKeywordsLoaded();
 
@@ skipping 193 matching lines @@
   // not initialised, so the registry must be mocked out.
   std::unique_ptr<WebappRegistry> webapp_registry_;
 #endif
 
   base::WeakPtrFactory<BrowsingDataRemover> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_