First experimental implementation of the Clear-Site-Data header

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 17 matching lines @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/after_startup_task_utils.h"
 #include "chrome/browser/apps/app_url_redirector.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #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"
 #include "chrome/browser/chrome_quota_permission_context.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #include "chrome/browser/download/download_prefs.h"
@@ skipping 109 matching lines @@
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/sandbox_type.h"
 #include "content/public/common/service_registry.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
 #include "device/usb/public/interfaces/chooser_service.mojom.h"
 #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"
 #include "ppapi/host/ppapi_host.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "url/gurl.h"
@@ skipping 2254 matching lines @@
 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,
                   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(
+          Profile::FromBrowserContext(browser_context));
+
+  int origin_type_mask =
+      BrowsingDataHelper::UNPROTECTED_WEB |
+      BrowsingDataHelper::PROTECTED_WEB |
+      BrowsingDataHelper::EXTENSION;
+
+  // Cookies and channel IDs are scoped to eTLD+1 and should be deleted
+  // in this scope.
+  if (remove_cookies || remove_storage) {

[Mike West, 2016/06/20 07:57:37]

Nit: I think this might end up simpler to understand if you drop this outer if,
and do something like:

```
std::string domain = ...;
int remove_mask = 0;
if (remove_cookies)
  remove_mask |= ...;
if (remove_storage)
  remove_mask |= ...;
if (remove_mask && !domain.empty()) {
  RegistrableDomainFilterBuilder(...);
  ...
}
```

[msramek, 2016/07/15 16:47:39]

Done.

+    std::string domain = GetDomainAndRegistry(
+        origin.host(),
+        net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
+
+    // TODO(msramek): What about origins such as http://localhost:80?
+    if (domain.empty())
+      return;

[Mike West, 2016/06/20 07:57:37]

Returning here is probably wrong. We can still clear the origin data below even
if we can't get a registry here.

[msramek, 2016/07/15 16:47:39]

Good catch :)

Fortunately, this is not needed anymore as we're handling localhost et al.
correctly after https://codereview.chromium.org/2127603002/ .

+
+    int remove_mask = 0;
+    if (remove_cookies)
+      remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
+    if (remove_storage)
+      remove_mask |= BrowsingDataRemover::REMOVE_CHANNEL_IDS;
+
+    RegistrableDomainFilterBuilder domain_filter_builder(
+        BrowsingDataFilterBuilder::WHITELIST);
+    domain_filter_builder.AddRegisterableDomain(domain);
+
+    remover->RemoveWithFilter(
+        BrowsingDataRemover::Period(
+            BrowsingDataRemover::TimePeriod::EVERYTHING),
+        remove_mask,
+        origin_type_mask,
+        domain_filter_builder);
+  }
+
+  // Delete origin-scoped data.
+  if (remove_storage || remove_cache) {
+    OriginFilterBuilder origin_filter_builder(
+        BrowsingDataFilterBuilder::WHITELIST);
+    origin_filter_builder.AddOrigin(origin);
+
+    int 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;
+
+    remover->RemoveWithFilter(

[Mike West, 2016/06/20 07:57:37]

It would be excellent to add some tests which verify that this method is being
called with the expected arguments.

[msramek, 2016/07/15 16:47:39]

I was going to say that two layers of testing should be enough, but given that I
made like 10 mistakes in this method already, that's a fair advice :)

Added unittests. This required making BrowsingDataFilters comparable, and
BrowsingDataRemover mockable.

+        BrowsingDataRemover::Period(
+            BrowsingDataRemover::TimePeriod::EVERYTHING),
+        remove_mask,
+        origin_type_mask,
+        origin_filter_builder);
+  }
+}
+
 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
   return DownloadPrefs::GetDefaultDownloadDirectory();
 }
 
 std::string ChromeContentBrowserClient::GetDefaultDownloadName() {
   return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME);
 }
 
 base::FilePath ChromeContentBrowserClient::GetShaderDiskCacheDirectory() {
   base::FilePath user_data_dir;
@@ skipping 507 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)