Reduce buggy usage of the registry controlled domain service.

chrome/browser/supervised_user/supervised_user_url_filter.cc

 // Copyright 2014 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/supervised_user/supervised_user_url_filter.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 21 matching lines @@
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/extension_urls.h"
 #endif
 
 using content::BrowserThread;
 using net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES;
 using net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES;
-using net::registry_controlled_domains::GetRegistryLength;
+using net::registry_controlled_domains::GetCanonicalHostRegistryLength;
 using policy::URLBlacklist;
 using url_matcher::URLMatcher;
 using url_matcher::URLMatcherConditionSet;
 
 using HostnameHash = SupervisedUserSiteList::HostnameHash;
 
 namespace {
 
 struct HashHostnameHash {
   size_t operator()(const HostnameHash& value) const {
@@ skipping 220 matching lines @@
 // static
 bool SupervisedUserURLFilter::HasFilteredScheme(const GURL& url) {
   for (const char* scheme : kFilteredSchemes) {
     if (url.scheme() == scheme)
       return true;
   }
   return false;
 }
 
 // static
-bool SupervisedUserURLFilter::HostMatchesPattern(const std::string& host,
-                                                 const std::string& pattern) {
+bool SupervisedUserURLFilter::HostMatchesPattern(
+    const std::string& canonical_host,
+    const std::string& pattern) {
   std::string trimmed_pattern = pattern;
-  std::string trimmed_host = host;
+  std::string trimmed_host = canonical_host;
   if (base::EndsWith(pattern, ".*", base::CompareCase::SENSITIVE)) {
-    size_t registry_length = GetRegistryLength(
+    size_t registry_length = GetCanonicalHostRegistryLength(
         trimmed_host, EXCLUDE_UNKNOWN_REGISTRIES, EXCLUDE_PRIVATE_REGISTRIES);
     // A host without a known registry part does not match.
     if (registry_length == 0)
       return false;
 
     trimmed_pattern.erase(trimmed_pattern.length() - 2);
     trimmed_host.erase(trimmed_host.length() - (registry_length + 1));
   }
 
   if (base::StartsWith(trimmed_pattern, "*.", base::CompareCase::SENSITIVE)) {
@@ skipping 323 matching lines @@
 
   FilteringBehavior behavior =
       GetBehaviorFromSafeSearchClassification(classification);
 
   callback.Run(behavior, supervised_user_error_page::ASYNC_CHECKER, uncertain);
   for (Observer& observer : observers_) {
     observer.OnURLChecked(url, behavior,
                           supervised_user_error_page::ASYNC_CHECKER, uncertain);
   }
 }