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..e02926e443ba378c841f9a1445581e9aa39a854e 100644
--- a/chrome/browser/browsing_data/origin_filter_builder.cc
+++ b/chrome/browser/browsing_data/origin_filter_builder.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
 
 namespace {
 
@@ -47,6 +48,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 +59,13 @@ base::Callback<bool(const GURL&)>
                     base::Owned(origins), mode_);
 }
 
+base::Callback<bool(const ContentSettingsPattern& pattern)>
+OriginFilterBuilder::BuildSameOriginContentSettingsFilter() const {

[msramek, 2016/03/01 17:24:09]

nit: indent

(or unindent in the other methods if you feel strongly, but keep it consistent
:) )

[dmurph, 2016/03/08 01:42:56]

Done.

+  std::set<url::Origin>* origins = new std::set<url::Origin>(origin_list_);
+  return base::Bind(&OriginFilterBuilder::MatchesContentSettingsPattern,
+                    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 +86,18 @@ bool OriginFilterBuilder::MatchesURL(
 }
 
 // static
+bool OriginFilterBuilder::MatchesContentSettingsPattern(

[msramek, 2016/03/01 17:24:09]

Please add a test for this method to OriginFilterBuilderTest.

[dmurph, 2016/03/08 01:42:56]

Done.

+    std::set<url::Origin>* origins,
+    Mode mode,
+    const ContentSettingsPattern& pattern) {
+  for (const url::Origin& origin : *origins) {
+    if ((mode == WHITELIST) && pattern.Matches(GURL(origin.Serialize())))

[msramek, 2016/03/01 17:24:09]

This method always returns false if mode == BLACKLIST.

[dmurph, 2016/03/08 01:42:56]

Ah, fixed.

+      return true;
+  }
+  return false;
+}
+
+// static
 bool OriginFilterBuilder::MatchesURLWithSubdomains(
     std::set<url::Origin>* origins, Mode mode, const GURL& url) {
   if (origins->empty())