Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 64036022fb276951403b1cccbbb2cb1c4f24d8a3..8e549f61fbfdc3fe60111cc4e3f31b74de23ce64 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -36,6 +36,8 @@ |
#include "chrome/browser/browsing_data/browsing_data_remover.h" |
#include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h" |
#include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
+#include "chrome/browser/browsing_data/origin_filter_builder.h" |
+#include "chrome/browser/browsing_data/registrable_domain_filter_builder.h" |
#include "chrome/browser/character_encoding.h" |
#include "chrome/browser/chrome_content_browser_client_parts.h" |
#include "chrome/browser/chrome_net_benchmarking_message_filter.h" |
@@ -168,6 +170,7 @@ |
#include "device/usb/public/interfaces/device_manager.mojom.h" |
#include "gin/v8_initializer.h" |
#include "net/base/mime_util.h" |
+#include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
#include "net/cookies/canonical_cookie.h" |
#include "net/cookies/cookie_options.h" |
#include "net/ssl/ssl_cert_request_info.h" |
@@ -2474,6 +2477,63 @@ void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) { |
BrowsingDataHelper::UNPROTECTED_WEB); |
} |
+void ChromeContentBrowserClient::ClearSiteData( |
+ content::BrowserContext* browser_context, |
+ const url::Origin& origin, |
+ bool remove_cookies, |
+ bool remove_storage, |
+ bool remove_cache) { |
+ BrowsingDataRemover* remover = |
+ BrowsingDataRemoverFactory::GetForBrowserContext(browser_context); |
+ |
+ // Cookies and channel IDs are scoped to |
+ // a) eTLD+1 of |origin|'s host if |origin|'s host is a registrable domain |
+ // or a subdomain thereof |
+ // b) |origin|'s host exactly if it is an IP address or an internal hostname |
+ // (e.g. "localhost" or "fileserver"). |
+ int remove_mask = 0; |
+ if (remove_cookies) { |
+ remove_mask |= BrowsingDataRemover::REMOVE_COOKIES | |
+ BrowsingDataRemover::REMOVE_CHANNEL_IDS; |
+ } |
+ |
+ std::string domain = GetDomainAndRegistry( |
+ origin.host(), |
+ net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); |
+ if (domain.empty()) |
+ domain = origin.host(); // IP address or internal hostname. |
+ |
+ if (remove_mask) { |
+ RegistrableDomainFilterBuilder domain_filter_builder( |
+ BrowsingDataFilterBuilder::WHITELIST); |
+ domain_filter_builder.AddRegisterableDomain(domain); |
+ |
+ remover->RemoveWithFilter( |
+ BrowsingDataRemover::Period(browsing_data::TimePeriod::EVERYTHING), |
+ remove_mask, BrowsingDataHelper::ALL, domain_filter_builder); |
+ } |
+ |
+ // Delete origin-scoped data. |
+ remove_mask = 0; |
+ if (remove_storage) { |
+ remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA & |
+ ~BrowsingDataRemover::REMOVE_COOKIES & |
+ ~BrowsingDataRemover::REMOVE_CHANNEL_IDS; |
+ } |
+ if (remove_cache) |
+ remove_mask |= BrowsingDataRemover::REMOVE_CACHE; |
+ |
+ if (remove_mask) { |
+ OriginFilterBuilder origin_filter_builder( |
+ BrowsingDataFilterBuilder::WHITELIST); |
+ origin_filter_builder.AddOrigin(origin); |
+ |
+ remover->RemoveWithFilter( |
+ BrowsingDataRemover::Period(browsing_data::TimePeriod::EVERYTHING), |
+ remove_mask, BrowsingDataHelper::ALL, origin_filter_builder); |
+ } |
+} |
+ |
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { |
return DownloadPrefs::GetDefaultDownloadDirectory(); |
} |