Reduce BrowsingDataRemover's dependencies on Chrome

chrome/browser/chrome_content_browser_client_unittest.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <list>
 #include <map>
 #include <memory>
 
@@ skipping 337 matching lines @@
 class MockBrowsingDataRemover : public BrowsingDataRemover {
  public:
   explicit MockBrowsingDataRemover(content::BrowserContext* context)
       : BrowsingDataRemover(context) {}
 
   ~MockBrowsingDataRemover() override {
     DCHECK(!expected_calls_.size())
         << "Expectations were set but not verified.";
   }
 
-  void RemoveInternal(const TimeRange& time_range,
+  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(time_range, remove_mask, origin_type_mask,
-                               std::move(filter_builder), UNKNOWN);
+    actual_calls_.emplace_back(delete_begin, delete_end, remove_mask,
+                               origin_type_mask, std::move(filter_builder),
+                               UNKNOWN);
 
     // |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 TimeRange& time_range,
+      const base::Time& delete_begin,
+      const base::Time& delete_end,
       int remove_mask,
       int origin_type_mask,
       std::unique_ptr<RegistrableDomainFilterBuilder> filter_builder) {
-    expected_calls_.emplace_back(time_range, remove_mask, origin_type_mask,
-                                 std::move(filter_builder),
+    expected_calls_.emplace_back(delete_begin, delete_end, remove_mask,
+                                 origin_type_mask, std::move(filter_builder),
                                  REGISTRABLE_DOMAIN_FILTER_BUILDER);
   }
 
-  void ExpectCall(const TimeRange& time_range,
+  void ExpectCall(const base::Time& delete_begin,
+                  const base::Time& delete_end,
                   int remove_mask,
                   int origin_type_mask,
                   std::unique_ptr<OriginFilterBuilder> filter_builder) {
-    expected_calls_.emplace_back(time_range, remove_mask, origin_type_mask,
-                                 std::move(filter_builder),
+    expected_calls_.emplace_back(delete_begin, delete_end, remove_mask,
+                                 origin_type_mask, std::move(filter_builder),
                                  ORIGIN_FILTER_BUILDER);
   }
 
-  void ExpectCallDontCareAboutFilterBuilder(const TimeRange& time_range,
+  void ExpectCallDontCareAboutFilterBuilder(const base::Time& delete_begin,
+                                            const base::Time& delete_end,
                                             int remove_mask,
                                             int origin_type_mask) {
-    expected_calls_.emplace_back(time_range, remove_mask, origin_type_mask,
+    expected_calls_.emplace_back(delete_begin, delete_end, remove_mask,
+                                 origin_type_mask,
                                  std::unique_ptr<BrowsingDataFilterBuilder>(),
                                  DONT_CARE);
   }
 
   void VerifyAndClearExpectations() {
     EXPECT_EQ(expected_calls_, actual_calls_);
     expected_calls_.clear();
     actual_calls_.clear();
   }
 
  private:
   // Used to further specify the type and intention behind the passed
   // std::unique_ptr<BrowsingDataFilterBuilder>. This is needed for comparison
   // between the expected and actual call parameters.
   enum FilterBuilderType {
     REGISTRABLE_DOMAIN_FILTER_BUILDER,  // RegistrableDomainFilterBuilder
     ORIGIN_FILTER_BUILDER,              // OriginFilterBuilder
     UNKNOWN,                            // can't static_cast<>
     DONT_CARE                           // don't have to compare for equality
   };
 
   class CallParameters {
    public:
-    CallParameters(const TimeRange& time_range,
+    CallParameters(const base::Time& delete_begin,
+                   const base::Time& delete_end,
                    int remove_mask,
                    int origin_type_mask,
                    std::unique_ptr<BrowsingDataFilterBuilder> filter_builder,
                    FilterBuilderType type)
-        : time_range_(time_range),
+        : delete_begin_(delete_begin),
+          delete_end_(delete_end),
           remove_mask_(remove_mask),
           origin_type_mask_(origin_type_mask),
           filter_builder_(std::move(filter_builder)),
           type_(type) {}
     ~CallParameters() {}
 
     bool operator==(const CallParameters& other) const {
       const CallParameters& a = *this;
       const CallParameters& b = other;
 
-      if (!(a.time_range_ == b.time_range_) ||
+      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.type_ == DONT_CARE || b.type_ == DONT_CARE)
         return true;
       if (a.type_ == UNKNOWN && b.type_ == UNKNOWN)
         return false;
       if (a.type_ != UNKNOWN && b.type_ != UNKNOWN && a.type_ != b.type_)
@@ skipping 13 matching lines @@
                    a.filter_builder_.get()) ==
                *static_cast<RegistrableDomainFilterBuilder*>(
                    b.filter_builder_.get());
       }
 
       NOTREACHED();
       return false;
     }
 
    private:
-    TimeRange time_range_;
+    base::Time delete_begin_;
+    base::Time delete_end_;
     int remove_mask_;
     int origin_type_mask_;
     std::unique_ptr<BrowsingDataFilterBuilder> filter_builder_;
     FilterBuilderType type_;
   };
 
   std::list<CallParameters> actual_calls_;
   std::list<CallParameters> expected_calls_;
 };
 
@@ skipping 61 matching lines @@
                                ~BrowsingDataRemover::REMOVE_PLUGIN_DATA)},
       {true, true, true, BrowsingDataRemover::REMOVE_SITE_DATA |
                              BrowsingDataRemover::REMOVE_CACHE},
   };
 
   for (unsigned int i = 0; i < arraysize(test_cases); ++i) {
     SCOPED_TRACE(base::StringPrintf("Test case %d", i));
     const TestCase& test_case = test_cases[i];
 
     // We always delete data for all time and all origin types.
-    BrowsingDataRemover::TimeRange all_time(base::Time(), base::Time::Max());
     BrowsingDataHelper::OriginTypeMask all_origin_types =
         BrowsingDataHelper::ALL;
 
     // Some data are deleted for the origin and some for the registrable domain.
     // Depending on the chosen datatypes, this might result into one or two
     // calls. In the latter case, the removal mask will be split into two
     // parts - one for the origin deletion and one for the registrable domain.
     const int domain_scoped_types = BrowsingDataRemover::REMOVE_COOKIES |
                                     BrowsingDataRemover::REMOVE_CHANNEL_IDS |
                                     BrowsingDataRemover::REMOVE_PLUGIN_DATA;
     int registrable_domain_deletion_mask = test_case.mask & domain_scoped_types;
     int origin_deletion_mask = test_case.mask & ~domain_scoped_types;
 
     if (registrable_domain_deletion_mask) {
       remover()->ExpectCallDontCareAboutFilterBuilder(
-          all_time, registrable_domain_deletion_mask, all_origin_types);
+          base::Time(), base::Time::Max(),
+          registrable_domain_deletion_mask, all_origin_types);
     }
 
     if (origin_deletion_mask) {
       remover()->ExpectCallDontCareAboutFilterBuilder(
-          all_time, origin_deletion_mask, all_origin_types);
+          base::Time(), base::Time::Max(),
+          origin_deletion_mask, all_origin_types);
     }
 
     SetClearingFinished(false);
     client.ClearSiteData(
         profile(), url::Origin(GURL("https://www.example.com")),
         test_case.cookies, test_case.storage, test_case.cache,
         base::Bind(
             &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
             base::Unretained(this), true));
     EXPECT_TRUE(IsClearingFinished());
@@ skipping 47 matching lines @@
 
   for (const TestCase& test_case : test_cases) {
     SCOPED_TRACE(test_case.origin);
 
     std::unique_ptr<RegistrableDomainFilterBuilder>
         registrable_domain_filter_builder(new RegistrableDomainFilterBuilder(
             BrowsingDataFilterBuilder::WHITELIST));
     registrable_domain_filter_builder->AddRegisterableDomain(test_case.domain);
 
     remover()->ExpectCall(
-        BrowsingDataRemover::Period(browsing_data::TimePeriod::ALL_TIME),
+        base::Time(), base::Time::Max(),
         BrowsingDataRemover::REMOVE_COOKIES |
             BrowsingDataRemover::REMOVE_CHANNEL_IDS |
             BrowsingDataRemover::REMOVE_PLUGIN_DATA,
         BrowsingDataHelper::ALL, std::move(registrable_domain_filter_builder));
 
     std::unique_ptr<OriginFilterBuilder> origin_filter_builder(
         new OriginFilterBuilder(BrowsingDataFilterBuilder::WHITELIST));
     origin_filter_builder->AddOrigin(url::Origin(GURL(test_case.origin)));
 
     remover()->ExpectCall(
-        BrowsingDataRemover::Period(browsing_data::TimePeriod::ALL_TIME),
+        base::Time(), base::Time::Max(),
         BrowsingDataRemover::REMOVE_CACHE, BrowsingDataHelper::ALL,
         std::move(origin_filter_builder));
 
     SetClearingFinished(false);
     client.ClearSiteData(
         profile(), url::Origin(GURL(test_case.origin)), true /* cookies */,
         false /* storage */, true /* cache */,
         base::Bind(
             &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
             base::Unretained(this), true));
@@ skipping 44 matching lines @@
   client.ClearSiteData(
       profile(), origin, true /* cookies */, false /* storage */,
       true /* cache */,
       base::Bind(
           &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
           base::Unretained(this), true));
   EXPECT_TRUE(IsClearingFinished());
 }
 
 }  // namespace