| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h" | 5 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 base::Callback<bool(const std::string& cookie)> | 100 base::Callback<bool(const std::string& cookie)> |
| 101 RegistrableDomainFilterBuilder::BuildChannelIDFilter() const { | 101 RegistrableDomainFilterBuilder::BuildChannelIDFilter() const { |
| 102 std::set<std::string>* domains_and_ips = | 102 std::set<std::string>* domains_and_ips = |
| 103 new std::set<std::string>(domain_list_); | 103 new std::set<std::string>(domain_list_); |
| 104 return base::Bind( | 104 return base::Bind( |
| 105 &RegistrableDomainFilterBuilder | 105 &RegistrableDomainFilterBuilder |
| 106 ::MatchesChannelIDForRegisterableDomainsAndIPs, | 106 ::MatchesChannelIDForRegisterableDomainsAndIPs, |
| 107 base::Owned(domains_and_ips), mode()); | 107 base::Owned(domains_and_ips), mode()); |
| 108 } | 108 } |
| 109 | 109 |
| 110 base::Callback<bool(const std::string& site)> |
| 111 RegistrableDomainFilterBuilder::BuildPluginFilter() const { |
| 112 std::set<std::string>* domains_and_ips = |
| 113 new std::set<std::string>(domain_list_); |
| 114 return base::Bind( |
| 115 &RegistrableDomainFilterBuilder |
| 116 ::MatchesPluginSiteForRegisterableDomainsAndIPs, |
| 117 base::Owned(domains_and_ips), mode()); |
| 118 } |
| 119 |
| 110 bool RegistrableDomainFilterBuilder::operator==( | 120 bool RegistrableDomainFilterBuilder::operator==( |
| 111 const RegistrableDomainFilterBuilder& other) const { | 121 const RegistrableDomainFilterBuilder& other) const { |
| 112 return domain_list_ == other.domain_list_ && mode() == other.mode(); | 122 return domain_list_ == other.domain_list_ && mode() == other.mode(); |
| 113 } | 123 } |
| 114 | 124 |
| 115 bool RegistrableDomainFilterBuilder::IsEmpty() const { | 125 bool RegistrableDomainFilterBuilder::IsEmpty() const { |
| 116 return domain_list_.empty(); | 126 return domain_list_.empty(); |
| 117 } | 127 } |
| 118 | 128 |
| 119 // static | 129 // static |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 | 175 |
| 166 // static | 176 // static |
| 167 bool | 177 bool |
| 168 RegistrableDomainFilterBuilder::MatchesChannelIDForRegisterableDomainsAndIPs( | 178 RegistrableDomainFilterBuilder::MatchesChannelIDForRegisterableDomainsAndIPs( |
| 169 std::set<std::string>* domains_and_ips, | 179 std::set<std::string>* domains_and_ips, |
| 170 Mode mode, | 180 Mode mode, |
| 171 const std::string& channel_id_server_id) { | 181 const std::string& channel_id_server_id) { |
| 172 return ((mode == WHITELIST) == (domains_and_ips->find(channel_id_server_id) != | 182 return ((mode == WHITELIST) == (domains_and_ips->find(channel_id_server_id) != |
| 173 domains_and_ips->end())); | 183 domains_and_ips->end())); |
| 174 } | 184 } |
| 185 |
| 186 // static |
| 187 bool |
| 188 RegistrableDomainFilterBuilder::MatchesPluginSiteForRegisterableDomainsAndIPs( |
| 189 std::set<std::string>* domains_and_ips, |
| 190 Mode mode, |
| 191 const std::string& site) { |
| 192 // If |site| is a third- or lower-level domain, find the corresponding eTLD+1. |
| 193 std::string domain_or_ip = |
| 194 GetDomainAndRegistry(site, INCLUDE_PRIVATE_REGISTRIES); |
| 195 if (domain_or_ip.empty()) |
| 196 domain_or_ip = site; |
| 197 |
| 198 return ((mode == WHITELIST) == (domains_and_ips->find(domain_or_ip) != |
| 199 domains_and_ips->end())); |
| 200 } |
| OLD | NEW |