Add support for split Public Suffix List distinctions.

chrome/browser/intranet_redirect_detector.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/intranet_redirect_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 102 matching lines @@
       return;
     }
     redirect_origin_ = GURL();
   } else {
     DCHECK(source->GetURL().is_valid());
     GURL origin(source->GetURL().GetOrigin());
     if (resulting_origins_.empty()) {
       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.
         DCHECK(fetchers_.size() == 1);
         delete (*fetchers_.begin());
         fetchers_.clear();
       }
     }
     if (resulting_origins_.size() == 1) {
       resulting_origins_.push_back(origin);
       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(
       prefs::kLastKnownIntranetRedirectOrigin, redirect_origin_.is_valid() ?
           redirect_origin_.spec() : std::string());
 }
 
 void IntranetRedirectDetector::OnIPAddressChanged() {
   // If a request is already scheduled, do not scheduled yet another one.
   if (in_sleep_)
@@ skipping 24 matching lines @@
   // the same thread.  So just use the heuristic that any all-lowercase a-z
   // hostname with the right number of characters is likely from the detector
   // (and thus should be blocked).
   return ((host.length() == IntranetRedirectDetector::kNumCharsInHostnames) &&
       (host.find_first_not_of("abcdefghijklmnopqrstuvwxyz") ==
           std::string::npos)) ?
       net::ERR_NAME_NOT_RESOLVED :
       ResolveUsingPrevious(host, address_family, host_resolver_flags, addrlist,
                            os_error);
 }