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

Unified Diff: chrome/browser/intranet_redirect_detector.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
« no previous file with comments | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/net/url_fixer_upper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/intranet_redirect_detector.cc
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index 0b79e63343508c67d3528aed88d91671d96bb6aa..d0290ade718b2079de27180cc7a84ea9ef6b22ac 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -120,8 +120,10 @@ void IntranetRedirectDetector::OnURLFetchComplete(
resulting_origins_.push_back(origin);
return;
}
- if (net::RegistryControlledDomainService::SameDomainOrHost(
- resulting_origins_.front(), origin)) {
+ if (net::registry_controlled_domains::SameDomainOrHost(
+ resulting_origins_.front(),
+ origin,
+ net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {
redirect_origin_ = origin;
if (!fetchers_.empty()) {
// Cancel remaining fetch, we don't need it.
@@ -135,8 +137,12 @@ void IntranetRedirectDetector::OnURLFetchComplete(
return;
}
DCHECK(resulting_origins_.size() == 2);
- redirect_origin_ = net::RegistryControlledDomainService::SameDomainOrHost(
- resulting_origins_.back(), origin) ? origin : GURL();
+ const bool same_domain_or_host =
+ net::registry_controlled_domains::SameDomainOrHost(
+ resulting_origins_.back(),
+ origin,
+ net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+ redirect_origin_ = same_domain_or_host ? origin : GURL();
}
g_browser_process->local_state()->SetString(
« no previous file with comments | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/net/url_fixer_upper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698