Add support for split Public Suffix List distinctions.

chrome/browser/google/google_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/google/google_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 74 matching lines @@
 
 std::string StringAppendGoogleLocaleParam(const std::string& url) {
   GURL original_url(url);
   DCHECK(original_url.is_valid());
   GURL localized_url = AppendGoogleLocaleParam(original_url);
   return localized_url.spec();
 }
 
 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();
     return url;
   }
   return net::AppendQueryParameter(url, "sd",
                                    google_domain.substr(first_dot + 1));
 }
 
 #if defined(OS_WIN)
@@ skipping 63 matching lines @@
       return true;
   }
 
   return (original_url.port().empty() ||
       port_permission == ALLOW_NON_STANDARD_PORTS) &&
       google_util::IsGoogleHostname(original_url.host(), subdomain_permission);
 }
 
 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);
   if (LowerCaseEqualsASCII(host_minus_tld, "google."))
     return true;
   if (subdomain_permission == ALLOW_SUBDOMAIN)
     return EndsWith(host_minus_tld, ".google.", false);
   return LowerCaseEqualsASCII(host_minus_tld, "www.google.");
 }
 
@@ skipping 99 matching lines @@
   const char* const kBrands[] = {
     "CHIQ", "CHSG", "HLJY", "NTMO", "OOBA", "OOBB", "OOBC", "OOBD", "OOBE",
     "OOBF", "OOBG", "OOBH", "OOBI", "OOBJ", "IDCM",
   };
   const char* const* end = &kBrands[arraysize(kBrands)];
   const char* const* found = std::find(&kBrands[0], end, brand);
   return found != end;
 }
 
 }  // namespace google_util