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

2 files changed, 4 insertions, 7 deletions

diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index 115ca3d..0b0bb68 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -1959,7 +1959,7 @@ int CookieMonster::GarbageCollectDeleteRange(
   return it_end - it_begin;
 }
 
-// A wrapper around registry_controlled_domains::GetDomainAndRegistry
+// A wrapper around RegistryControlledDomainService::GetDomainAndRegistry
 // to make clear we're creating a key for our local map.  Here and
 // in FindCookiesForHostAndDomain() are the only two places where
 // we need to conditionalize based on key type.
@@ -1984,8 +1984,7 @@ int CookieMonster::GarbageCollectDeleteRange(
 // non-problem).
 std::string CookieMonster::GetKey(const std::string& domain) const {
   std::string effective_domain(
-      registry_controlled_domains::GetDomainAndRegistry(
-          domain, registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES));
+      RegistryControlledDomainService::GetDomainAndRegistry(domain));
   if (effective_domain.empty())
     effective_domain = domain;
 
diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc
index fac473b..908c858 100644
--- a/net/cookies/cookie_util.cc
+++ b/net/cookies/cookie_util.cc
@@ -24,10 +24,8 @@ bool DomainIsHostOnly(const std::string& domain_string) {
 
 std::string GetEffectiveDomain(const std::string& scheme,
                                const std::string& host) {
-  if (scheme == "http" || scheme == "https") {
-    return registry_controlled_domains::GetDomainAndRegistry(
-        host, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-  }
+  if (scheme == "http" || scheme == "https")
+    return RegistryControlledDomainService::GetDomainAndRegistry(host);
 
   if (!DomainIsHostOnly(host))
     return host.substr(1);