Reduce BrowsingDataRemover's dependencies on Chrome

chrome/browser/chrome_content_browser_client.cc

 // 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 103 matching lines @@
 #include "chrome/common/renderer_configuration.mojom.h"
 #include "chrome/common/secure_origin_whitelist.h"
 #include "chrome/common/stack_sampling_configuration.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chromeos/chromeos_constants.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/common/autofill_switches.h"
+#include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/cdm/browser/cdm_message_filter_android.h"
 #include "components/cloud_devices/common/cloud_devices_switches.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/error_page/common/error_page_switches.h"
@@ skipping 2441 matching lines @@
 
   // chrome: & friends.
   handler->AddHandlerPair(&HandleWebUI, &HandleWebUIReverse);
 }
 
 void ChromeContentBrowserClient::ClearCache(RenderFrameHost* rfh) {
   Profile* profile = Profile::FromBrowserContext(
       rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
   BrowsingDataRemover* remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(profile);
-  remover->Remove(BrowsingDataRemover::Unbounded(),
+  remover->Remove(base::Time(), base::Time::Max(),
                   BrowsingDataRemover::REMOVE_CACHE,
                   BrowsingDataHelper::UNPROTECTED_WEB);
 }
 
 void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) {
   Profile* profile = Profile::FromBrowserContext(
       rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
   BrowsingDataRemover* remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(profile);
   int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
-  remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask,
+  remover->Remove(base::Time(), base::Time::Max(), remove_mask,
                   BrowsingDataHelper::UNPROTECTED_WEB);
 }
 
 void ChromeContentBrowserClient::ClearSiteData(
     content::BrowserContext* browser_context,
     const url::Origin& origin,
     bool remove_cookies,
     bool remove_storage,
     bool remove_cache,
     const base::Closure& callback) {
@@ skipping 17 matching lines @@
 
     if (domain.empty())
       domain = origin.host();  // IP address or internal hostname.
 
     std::unique_ptr<RegistrableDomainFilterBuilder> domain_filter_builder(
         new RegistrableDomainFilterBuilder(
             BrowsingDataFilterBuilder::WHITELIST));
     domain_filter_builder->AddRegisterableDomain(domain);
 
     remover->RemoveWithFilterAndReply(
-        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(domain_filter_builder), observer);
   } else {
     // The first removal task is a no-op.
     observer->OnBrowsingDataRemoverDone();
   }
 
   // Delete origin-scoped data.
   int remove_mask = 0;
   if (remove_storage) {
     remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA &
                    ~BrowsingDataRemover::REMOVE_COOKIES &
                    ~BrowsingDataRemover::REMOVE_CHANNEL_IDS &
                    ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
   }
   if (remove_cache)
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
 
   if (remove_mask) {
     std::unique_ptr<OriginFilterBuilder> origin_filter_builder(
         new OriginFilterBuilder(BrowsingDataFilterBuilder::WHITELIST));
     origin_filter_builder->AddOrigin(origin);
 
     remover->RemoveWithFilterAndReply(
-        BrowsingDataRemover::Period(browsing_data::TimePeriod::ALL_TIME),
+        base::Time(), base::Time::Max(),
         remove_mask, BrowsingDataHelper::ALL, std::move(origin_filter_builder),
         observer);
   } else {
     // The second removal task is a no-op.
     observer->OnBrowsingDataRemoverDone();
   }
 }
 
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
   return DownloadPrefs::GetDefaultDownloadDirectory();
@@ skipping 703 matching lines @@
 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true";
 }
 
 bool ChromeContentBrowserClient::
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }