Remove the content settings dependencies from BrowsingDataFilterBuilder et al.

chrome/browser/browsing_data/origin_filter_builder.h

Index: chrome/browser/browsing_data/origin_filter_builder.h
diff --git a/chrome/browser/browsing_data/origin_filter_builder.h b/chrome/browser/browsing_data/origin_filter_builder.h
index be410d351ca7c2911a51e4585ed241c1759eb608..7e0a4f8b9df1334ec16f27ea79f4310cf34a6155 100644
--- a/chrome/browser/browsing_data/origin_filter_builder.h
+++ b/chrome/browser/browsing_data/origin_filter_builder.h
@@ -37,16 +37,6 @@ class OriginFilterBuilder : public BrowsingDataFilterBuilder {
   // or aren't in the blacklist.
   base::Callback<bool(const GURL&)> BuildGeneralFilter() const override;
 
-  // Builds a filter that calls ContentSettingsPattern::Compare on the given
-  // pattern and a new pattern constructed by each origin in this filter. The
-  // domain pattern A and given pattern B match when A.Compare(B) is IDENTITY.
-  // This is sufficient, because website settings should only ever store
-  // origin-scoped patterns. Furthermore, website settings patterns support
-  // paths, but only for the file:// scheme, which is in turn not supported
-  // by OriginFilterBuilder.
-  base::Callback<bool(const ContentSettingsPattern& pattern)>
-      BuildWebsiteSettingsPatternMatchesFilter() const override;
-
   // Cookie filter is not implemented in this subclass. Please use
   // a BrowsingDataFilterBuilder with different scoping,
   // such as RegistrableDomainFilterBuilder.
@@ -76,12 +66,6 @@ class OriginFilterBuilder : public BrowsingDataFilterBuilder {
   static bool MatchesURL(
       std::set<url::Origin>* origins, Mode mode, const GURL& url);
 
-  // True if the |pattern| is identical to one of the |origin_patterns|.
-  static bool MatchesWebsiteSettingsPattern(
-      std::vector<ContentSettingsPattern>* origin_patterns,
-      Mode mode,
-      const ContentSettingsPattern& pattern);
-
   // The list of origins and whether they should be interpreted as a whitelist
   // or blacklist.
   std::set<url::Origin> origin_list_;