Add support for split Public Suffix List distinctions.

chrome/browser/ui/omnibox/alternate_nav_url_fetcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h"
 
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h"
@@ skipping 115 matching lines @@
     int response_code) {
   if (status.is_success()) {
     // HTTP 2xx, 401, and 407 all indicate that the target address exists.
     state_ = (((response_code / 100) == 2) || (response_code == 401) ||
         (response_code == 407)) ? SUCCEEDED : FAILED;
   } else {
     // If we got HTTP 3xx, we'll have auto-canceled; treat this as evidence the
     // 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;
+    }
   }
 }
 
 void AlternateNavURLFetcher::ShowInfobarIfPossible() {
   if (navigated_to_entry_ && (state_ == SUCCEEDED)) {
     AlternateNavInfoBarDelegate::Create(
         InfoBarService::FromWebContents(controller_->GetWebContents()),
         alternate_nav_url_);
   } else if (state_ != FAILED) {
     return;
   }
   delete this;
 }