| Index: chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc
|
| diff --git a/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc b/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc
|
| index cccb07d11b56237fb436794f96575b3aa7d93912..c6e6d633050953f55765d331c086712808de25f0 100644
|
| --- a/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc
|
| +++ b/chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc
|
| @@ -133,10 +133,17 @@ void AlternateNavURLFetcher::SetStatusFromURLFetch(
|
| // target address exists as long as we're not redirected to a common
|
| // location every time, lest we annoy the user with infobars on everything
|
| // they type. See comments on IntranetRedirectDetector.
|
| - state_ = ((status.status() == net::URLRequestStatus::CANCELED) &&
|
| - ((response_code / 100) == 3) &&
|
| - !net::RegistryControlledDomainService::SameDomainOrHost(url,
|
| - IntranetRedirectDetector::RedirectOrigin())) ? SUCCEEDED : FAILED;
|
| + if (status.status() == net::URLRequestStatus::CANCELED &&
|
| + (response_code / 100) == 3) {
|
| + const bool same_domain_or_host =
|
| + net::registry_controlled_domains::SameDomainOrHost(
|
| + url,
|
| + IntranetRedirectDetector::RedirectOrigin(),
|
| + net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
|
| + state_ = same_domain_or_host ? FAILED : SUCCEEDED;
|
| + } else {
|
| + state_ = FAILED;
|
| + }
|
| }
|
| }
|
|
|
|
|