diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 18:12:48 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 18:12:48 +0000 |
| commit | 1e690d65afc4f616671ddbabbd2f47dce45c514d (patch) | |
| tree | f4312c7ca39b90b6647b1c6089c37aab74efb7ab /chrome/browser/net | |
| parent | c5cba4cb2c4eceda230f8e6a07121285725bff3a (diff) | |
| download | chromium_src-1e690d65afc4f616671ddbabbd2f47dce45c514d.zip chromium_src-1e690d65afc4f616671ddbabbd2f47dce45c514d.tar.gz chromium_src-1e690d65afc4f616671ddbabbd2f47dce45c514d.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/url_fixer_upper.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index e965be8..f941c4b 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -195,7 +195,10 @@ void AddDesiredTLD(const std::string& desired_tld, std::string* domain) { // users can input "mail.yahoo" and hit ctrl-enter to get // "www.mail.yahoo.com". const size_t registry_length = - net::RegistryControlledDomainService::GetRegistryLength(*domain, false); + net::registry_controlled_domains::GetRegistryLength( + *domain, + net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, + net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); if ((registry_length != 0) && (registry_length != std::string::npos)) return; |