summaryrefslogtreecommitdiffstats
path: root/net/ssl
diff options
context:
space:
mode:
authornyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-13 18:33:30 +0000
committernyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-13 18:33:30 +0000
commit9aff2d195bab7e0040e80c4f70ebc8b23601076f (patch)
treec9163b54377a40050454bfe101eecc8467e2a938 /net/ssl
parentc60e3d89f914a4b1be19114fe695c6ad7e2a5b32 (diff)
downloadchromium_src-9aff2d195bab7e0040e80c4f70ebc8b23601076f.zip
chromium_src-9aff2d195bab7e0040e80c4f70ebc8b23601076f.tar.gz
chromium_src-9aff2d195bab7e0040e80c4f70ebc8b23601076f.tar.bz2
Revert 199771 "Add support for split Public Suffix List distinct..."
> Add support for split Public Suffix List distinctions. > > This adds support for the private additions to the Public Suffix List. > > * Since net::RegistryControlledDomainService only contained static methods, this > CL changes these methods to be contained within the namespace > net::registry_controlled_domains and removes the class entirely. > * All methods defined as part of net::registry_controlled_domains now > have a mandatory argument to specify whether the private registries > should be included. > * Since the old implementation did not take into account the private > registries, this sets all old callers to use EXCLUDE_PRIVATE as the > net::registry_controlled_domains::PrivateRegistryFilter argument. > * Changes the parameter for including unknown registries or not to be an enum > instead of a boolean, using a similar naming scheme as for the private > registries: net::registry_controlled_domains::UnknownRegistryFilter. > * This also updates the effective-TLD data file to: > 45cfff9c781f 2013-04-23 11:51 +0100 > It includes changes from a number of Mozilla bugs, listed on > https://hg.mozilla.org/mozilla-central/log/45cfff9c781f/netwerk/dns/effective_tld_names.dat > between 290afd57d2a8 (2012-07-04 16:08 +0100) and > 45cfff9c781f (2013-04-23 11:51 +0100). > > BUG=37436,96086 > R=brettw@chromium.org, erikwright@chromium.org, pam@chromium.org, rsleevi@chromium.org, sky@chromium.org > > Review URL: https://codereview.chromium.org/13979002 TBR=nyquist@chromium.org Review URL: https://codereview.chromium.org/14767028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ssl')
-rw-r--r--net/ssl/server_bound_cert_service.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ssl/server_bound_cert_service.cc b/net/ssl/server_bound_cert_service.cc
index 327ca93..470ef54 100644
--- a/net/ssl/server_bound_cert_service.cc
+++ b/net/ssl/server_bound_cert_service.cc
@@ -413,8 +413,7 @@ ServerBoundCertService::~ServerBoundCertService() {
//static
std::string ServerBoundCertService::GetDomainForHost(const std::string& host) {
std::string domain =
- registry_controlled_domains::GetDomainAndRegistry(
- host, registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+ RegistryControlledDomainService::GetDomainAndRegistry(host);
if (domain.empty())
return host;
return domain;