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

1 files changed, 1 insertions, 2 deletions

diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index 1ef4026..f85302f 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -252,8 +252,7 @@ string16 ElideUrl(const GURL& url,
 
   // Get domain and registry information from the URL.
   string16 url_domain = UTF8ToUTF16(
-      net::registry_controlled_domains::GetDomainAndRegistry(
-          url, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES));
+      net::RegistryControlledDomainService::GetDomainAndRegistry(url));
   if (url_domain.empty())
     url_domain = url_host;