diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 19:40:37 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 19:40:37 +0000 |
| commit | 8ac1a75acadaa2aae065212cb6255d00c789a184 (patch) | |
| tree | 854eaf66ba8ce7e581bd8e6f1fa75f46d22f4bb7 /net/base/registry_controlled_domain.cc | |
| parent | 287a019ed5d015185cab41f6c7156dc6c4cbcee7 (diff) | |
| download | chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.zip chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.gz chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.bz2 | |
Move more net classes into the net namespace. Also remove the net_util namespace in favor of the net namespace.
This is a purely mechanical change. There should be no logic changes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/registry_controlled_domain.cc')
| -rw-r--r-- | net/base/registry_controlled_domain.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/base/registry_controlled_domain.cc b/net/base/registry_controlled_domain.cc index b573d17..f0aad4c 100644 --- a/net/base/registry_controlled_domain.cc +++ b/net/base/registry_controlled_domain.cc @@ -48,6 +48,8 @@ #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" +namespace net { + // This list of rules is used by unit tests and any other time that the main // resource file is not available. It should be kept exceedingly short to // avoid impacting unit test performance. @@ -73,8 +75,7 @@ std::string RegistryControlledDomainService::GetDomainAndRegistry( std::string RegistryControlledDomainService::GetDomainAndRegistry( const std::string& host) { bool is_ip_address; - const std::string canon_host(net_util::CanonicalizeHost(host, - &is_ip_address)); + const std::string canon_host(net::CanonicalizeHost(host, &is_ip_address)); if (canon_host.empty() || is_ip_address) return std::string(); return GetDomainAndRegistryImpl(canon_host); @@ -84,8 +85,7 @@ std::string RegistryControlledDomainService::GetDomainAndRegistry( std::string RegistryControlledDomainService::GetDomainAndRegistry( const std::wstring& host) { bool is_ip_address; - const std::string canon_host(net_util::CanonicalizeHost(host, - &is_ip_address)); + const std::string canon_host(net::CanonicalizeHost(host, &is_ip_address)); if (canon_host.empty() || is_ip_address) return std::string(); return GetDomainAndRegistryImpl(canon_host); @@ -133,8 +133,7 @@ size_t RegistryControlledDomainService::GetRegistryLength( const std::string& host, bool allow_unknown_registries) { bool is_ip_address; - const std::string canon_host(net_util::CanonicalizeHost(host, - &is_ip_address)); + const std::string canon_host(net::CanonicalizeHost(host, &is_ip_address)); if (canon_host.empty()) return std::string::npos; if (is_ip_address) @@ -148,8 +147,7 @@ size_t RegistryControlledDomainService::GetRegistryLength( const std::wstring& host, bool allow_unknown_registries) { bool is_ip_address; - const std::string canon_host(net_util::CanonicalizeHost(host, - &is_ip_address)); + const std::string canon_host(net::CanonicalizeHost(host, &is_ip_address)); if (canon_host.empty()) return std::string::npos; if (is_ip_address) @@ -349,3 +347,5 @@ bool RegistryControlledDomainService::StringSegment::operator<( } return (len_ < other.len_); } + +} // namespace net |