| 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(
|
|
|