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

Unified Diff: content/browser/site_instance_impl.cc

Issue 13979002: Add support for split PSL list distinctions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed chrome_frame compilation issue Created 7 years, 8 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..31b257903c9b42a13c9377f773adf5869cb78698 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -265,7 +265,8 @@ bool SiteInstance::IsSameWebSite(BrowserContext* browser_context,
if (url1.scheme() != url2.scheme())
return false;
- return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2);
+ return net::RegistryControlledDomainService::SameDomainOrHost(url1, url2,
+ net::RCDS::EXCLUDE_PRIVATE_REGISTRIES);
}
/*static*/
@@ -298,7 +299,8 @@ 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::RegistryControlledDomainService::GetDomainAndRegistry(url,
+ net::RCDS::EXCLUDE_PRIVATE_REGISTRIES);
if (!domain.empty()) {
GURL::Replacements rep;
rep.SetHostStr(domain);

Powered by Google App Engine
This is Rietveld 408576698