Index: chrome/browser/google/google_util.cc |
diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc |
index 50900bdefd099c02ef9d42944c632c233972d26e..4dfd8cba2f7d888e7192dc85b4a03b448ffd53dd 100644 |
--- a/chrome/browser/google/google_util.cc |
+++ b/chrome/browser/google/google_util.cc |
@@ -92,8 +92,9 @@ std::string StringAppendGoogleLocaleParam(const std::string& url) { |
GURL AppendGoogleTLDParam(Profile* profile, const GURL& url) { |
const std::string google_domain( |
- net::RegistryControlledDomainService::GetDomainAndRegistry( |
- GoogleURLTracker::GoogleURL(profile))); |
+ net::registry_controlled_domains::GetDomainAndRegistry( |
+ GoogleURLTracker::GoogleURL(profile), |
+ net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)); |
const size_t first_dot = google_domain.find('.'); |
if (first_dot == std::string::npos) { |
NOTREACHED(); |
@@ -177,8 +178,10 @@ bool IsGoogleDomainUrl(const std::string& url, |
bool IsGoogleHostname(const std::string& host, |
SubdomainPermission subdomain_permission) { |
- size_t tld_length = |
- net::RegistryControlledDomainService::GetRegistryLength(host, false); |
+ size_t tld_length = net::registry_controlled_domains::GetRegistryLength( |
+ host, |
+ net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES, |
+ net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); |
if ((tld_length == 0) || (tld_length == std::string::npos)) |
return false; |
std::string host_minus_tld(host, 0, host.length() - tld_length); |