Add support for split Public Suffix List distinctions.

content/browser/site_instance_impl.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 "content/browser/site_instance_impl.h"
 
 #include "base/command_line.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
@@ skipping 247 matching lines @@
     return true;
 
   // If either URL is invalid, they aren't part of the same site.
   if (!url1.is_valid() || !url2.is_valid())
     return false;
 
   // If the schemes differ, they aren't part of the same site.
   if (url1.scheme() != url2.scheme())
     return false;
 
-  return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
+  return net::registry_controlled_domains::SameDomainOrHost(
+      url1,
+      url2,
+      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
 }
 
 /*static*/
 GURL SiteInstance::GetSiteForURL(BrowserContext* browser_context,
                                  const GURL& real_url) {
   // TODO(fsamuel, creis): For some reason appID is not recognized as a host.
   if (real_url.SchemeIs(chrome::kGuestScheme))
     return real_url;
 
   GURL url = SiteInstanceImpl::GetEffectiveURL(browser_context, real_url);
@@ skipping 12 matching lines @@
 
     // Remove port, if any.
     if (site.has_port()) {
       GURL::Replacements rep;
       rep.ClearPort();
       site = site.ReplaceComponents(rep);
     }
 
     // If this URL has a registered domain, we only want to remember that part.
     std::string domain =
-        net::RegistryControlledDomainService::GetDomainAndRegistry(url);
+        net::registry_controlled_domains::GetDomainAndRegistry(
+            url,
+            net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
     if (!domain.empty()) {
       GURL::Replacements rep;
       rep.SetHostStr(domain);
       site = site.ReplaceComponents(rep);
     }
   }
   return site;
 }
 
 /*static*/
@@ skipping 18 matching lines @@
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableStrictSiteIsolation) ||
       command_line.HasSwitch(switches::kSitePerProcess)) {
     ChildProcessSecurityPolicyImpl* policy =
         ChildProcessSecurityPolicyImpl::GetInstance();
     policy->LockToOrigin(process_->GetID(), site_);
   }
 }
 
 }  // namespace content