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

chrome/browser/browsing_data/origin_filter_builder.cc

 // Copyright 2016 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/browsing_data/origin_filter_builder.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
 
 namespace {
 
 bool NoopFilter(const GURL& url) {
   return true;
 }
 
 }  // namespace
 
 OriginFilterBuilder::OriginFilterBuilder(Mode mode)
@@ skipping 19 matching lines @@
   // origin. This is currently not a problem, but if it becomes one,
   // consider recognizing the URL path.
 
   origin_list_.insert(origin);
 }
 
 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_);
   return base::Bind(&OriginFilterBuilder::MatchesURL,
                     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_);
   return base::Bind(&OriginFilterBuilder::MatchesURLWithSubdomains,
                     base::Owned(origins), mode_);
 }
 
 // static
 base::Callback<bool(const GURL&)> OriginFilterBuilder::BuildNoopFilter() {
   return base::Bind(&NoopFilter);
 }
 
 // static
 bool OriginFilterBuilder::MatchesURL(
     std::set<url::Origin>* origins, Mode mode, const GURL& url) {
   return ((origins->find(url::Origin(url)) != origins->end()) ==
           (mode == WHITELIST));
 }
 
 // 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())
     return mode == BLACKLIST;
 
   // If there is no concept of subdomains, simply delegate to MatchesURL().
   if (url.HostIsIPAddress())
     return MatchesURL(origins, mode, url);
 
   // TODO(msramek): We do not expect filters to be particularly large.
@@ skipping 15 matching lines @@
     if (origins->find(url::Origin(origin_with_removed_subdomain))
         != origins->end()) {
       return mode == WHITELIST;
     }
   }
 
   // We do not recognize the URL. Return false for whitelist mode and true
   // for blacklist mode.
   return mode == BLACKLIST;
 }