Add removal filter support for Cookies, Storage, and Content Settings.

chrome/browser/browsing_data/origin_filter_builder.cc

Index: chrome/browser/browsing_data/origin_filter_builder.cc
diff --git a/chrome/browser/browsing_data/origin_filter_builder.cc b/chrome/browser/browsing_data/origin_filter_builder.cc
index 900b018310032b7c25264d00343dea8c920a9868..b21e8358c1106a4e58f57a67cdbbcd179dc340a5 100644
--- a/chrome/browser/browsing_data/origin_filter_builder.cc
+++ b/chrome/browser/browsing_data/origin_filter_builder.cc
@@ -8,6 +8,8 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 namespace {
 
@@ -47,6 +49,10 @@ void OriginFilterBuilder::SetMode(Mode mode) {
   mode_ = mode;
 }
 
+bool OriginFilterBuilder::IsEmptyBlacklist() const {
+  return mode_ == Mode::BLACKLIST && origin_list_.empty();
+}
+
 base::Callback<bool(const GURL&)>
     OriginFilterBuilder::BuildSameOriginFilter() const {
   std::set<url::Origin>* origins = new std::set<url::Origin>(origin_list_);
@@ -54,6 +60,20 @@ base::Callback<bool(const GURL&)>
                     base::Owned(origins), mode_);
 }
 
+base::Callback<bool(const ContentSettingsPattern& pattern)>
+    OriginFilterBuilder::BuildWebsiteSettingsPatternMatchesFilter() const {
+  std::set<url::Origin>* origins = new std::set<url::Origin>(origin_list_);
+  return base::Bind(&OriginFilterBuilder::MatchesWebsiteSettingsPattern,
+                    base::Owned(origins), mode_);
+}
+
+base::Callback<bool(const net::CanonicalCookie& pattern)>
+    OriginFilterBuilder::BuildDomainCookieFilter() const {
+  std::set<url::Origin>* origins = new std::set<url::Origin>(origin_list_);
+  return base::Bind(&OriginFilterBuilder::MatchesCookieForTLDPlusOne,
+                    base::Owned(origins), mode_);
+}
+
 base::Callback<bool(const GURL&)>
     OriginFilterBuilder::BuildDomainFilter() const {
   std::set<url::Origin>* origins = new std::set<url::Origin>(origin_list_);
@@ -74,6 +94,53 @@ bool OriginFilterBuilder::MatchesURL(
 }
 
 // static
+bool OriginFilterBuilder::MatchesWebsiteSettingsPattern(
+    std::set<url::Origin>* origins,
+    Mode mode,
+    const ContentSettingsPattern& pattern) {
+  for (const url::Origin& origin : *origins) {
+    if (pattern.Matches(GURL(origin.Serialize())))
+      return mode == WHITELIST;
+  }
+  return mode != WHITELIST;
+}
+
+// static
+bool OriginFilterBuilder::MatchesCookieForTLDPlusOne(

[Mike West, 2016/03/11 08:36:10]

Nit: Would you mind using something like "MatchesCookiesRegistrableDomain" as
opposed to "eTLD+1"? The former seems more likely to be clear. If you prefer the
latter, the "e" is important, as `appspot.com`'s TLD is "com", but it's
_effective_ TLD is "appspot.com". :)

[dmurph, 2016/03/30 22:21:26]

sgtm

+    std::set<url::Origin>* origins,
+    Mode mode,
+    const net::CanonicalCookie& cookie) {
+  if (origins->empty())
+    return mode == BLACKLIST;
+
+  bool found = false;
+  std::string cookie_domain = cookie.Domain();
+  if (cookie.IsDomainCookie()) {
+    cookie_domain = cookie_domain.substr(1);
+  }

[Mike West, 2016/03/11 08:36:10]

Nit: No {} around single-line clauses.

[dmurph, 2016/03/30 22:21:26]

Done.

+  std::string cookie_tld_plus_one =
+      net::registry_controlled_domains::GetDomainAndRegistry(
+          cookie_domain,
+          net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);

[Mike West, 2016/03/11 08:36:10]

You'll need to check for IP addresses here as well, right? You can probably
simplify this by checking for the cookie domain being an IP address, and
skipping all the registry controlled calls entirely by just doing a straight
comparison of the cookie's domain to the origin's host.

Then you can also skip the IP address bits in the for loop, because you know
they won't match.

[dmurph, 2016/03/30 22:21:26]

Did this in a slightly different way, but it now works.

+  for (const url::Origin& origin : *origins) {
+    GURL origin_url(origin.Serialize());
+    if (origin_url.HostIsIPAddress()) {
+      if (origin_url.host() == cookie_domain) {
+        found = true;
+        break;
+      }
+    } else if (cookie_tld_plus_one ==
+               net::registry_controlled_domains::GetDomainAndRegistry(
+                   origin.host(), net::registry_controlled_domains::
+                                      INCLUDE_PRIVATE_REGISTRIES)) {
+      found = true;
+      break;
+    }
+  }
+  return (mode == WHITELIST) == found;
+}
+
+// static
 bool OriginFilterBuilder::MatchesURLWithSubdomains(
     std::set<url::Origin>* origins, Mode mode, const GURL& url) {
   if (origins->empty())