Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Unified Diff: content/browser/site_instance_impl.cc

Issue 15140003: Add support for split Public Suffix List distinctions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased again Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/site_instance_impl.cc
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index 3a93f25c9fa5de8db5c3b77772fed47daedd22bd..b6f7d3327bf8d51ac923a248994ebea36eed815c 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -265,7 +265,10 @@ bool SiteInstance::IsSameWebSite(BrowserContext* browser_context,
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*/
@@ -298,7 +301,9 @@ GURL SiteInstance::GetSiteForURL(BrowserContext* browser_context,
// 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);
« no previous file with comments | « content/browser/net/sqlite_persistent_cookie_store.cc ('k') | content/browser/worker_host/worker_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698