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

Unified Diff: chrome/browser/intranet_redirect_detector.cc

Issue 13979002: Add support for split PSL list distinctions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added const modifiers 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: chrome/browser/intranet_redirect_detector.cc
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index 0b79e63343508c67d3528aed88d91671d96bb6aa..e14017fb5ad46a6b263b1e7a5f127c0891bfa030 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,11 @@ void IntranetRedirectDetector::OnURLFetchComplete(
return;
}
DCHECK(resulting_origins_.size() == 2);
- redirect_origin_ = net::RegistryControlledDomainService::SameDomainOrHost(
- resulting_origins_.back(), origin) ? origin : GURL();
+ redirect_origin_ = net::registry_controlled_domains::SameDomainOrHost(
+ resulting_origins_.back(),
+ origin,
+ net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES) ?
+ origin : GURL();
}
g_browser_process->local_state()->SetString(

Powered by Google App Engine
This is Rietveld 408576698