First experimental implementation of the Clear-Site-Data header

chrome/browser/chrome_content_browser_client.cc

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 e1ac0da6189102ca53cbfc1457129729cc5854cd..7a541b21cb0196d4bd1c2c061f8f396fb4f905d1 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -35,6 +35,8 @@
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.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"
@@ -166,6 +168,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"
@@ -2484,6 +2487,66 @@ 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;
+  if (remove_storage)

[Mike West, 2016/07/18 10:20:34]

Clearing channel ID and cookies based on separate flags still feels wrong to me.
Did you take a look at my comments in
https://codereview.chromium.org/2025683003#msg27? I didn't see a response...

[msramek, 2016/07/18 13:16:07]

I moved REMOVE_CHANNEL_IDS to the "cookies" bucket. My original plan, as I
mentioned in an earlier comment, was to bundle it with REMOVE_COOKIES. However,
that is unnecessary - REMOVE_CHANNEL_IDS and REMOVE_COOKIES are in the exact
same situation in that they're both part of REMOVE_SITE_DATA, but not a part of
the "storage" bucket.

I still can make that particular change if you believe that there is no reason
*in general*, not just in this API, to delete cookies without channel IDs. I can
see that you also bundled them together in the extension API. But that doesn't
have to block this CL.

+    remove_mask |= 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();
 }