Revert of Reduce buggy usage of the registry controlled domain service.

extensions/common/url_pattern.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 "extensions/common/url_pattern.h"
 
 #include <stddef.h>
 
 #include <ostream>
 
@@ skipping 427 matching lines @@
   // Check if it matches all urls or is a pattern like http://*/*.
   if (match_all_urls_ ||
       (match_subdomains_ && host_.empty() && port_ == "*" && path_ == "/*")) {
     return true;
   }
 
   // If this doesn't even match subdomains, it can't possibly imply all hosts.
   if (!match_subdomains_)
     return false;
 
+  // If |host_| is a recognized TLD, this will be 0. We don't include private
+  // TLDs, so that, e.g., *.appspot.com does not imply all hosts.
+  size_t registry_length = net::registry_controlled_domains::GetRegistryLength(
+      host_,
+      net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
   // If there was more than just a TLD in the host (e.g., *.foobar.com), it
-  // doesn't imply all hosts. We don't include private TLDs, so that, e.g.,
-  // *.appspot.com does not imply all hosts.
-  if (net::registry_controlled_domains::HostHasRegistryControlledDomain(
-          host_, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES))
+  // doesn't imply all hosts.
+  if (registry_length > 0)
     return false;
 
   // At this point the host could either be just a TLD ("com") or some unknown
   // TLD-like string ("notatld"). To disambiguate between them construct a
-  // fake URL, and check the registry.
-  //
-  // If we recognized this TLD, then this is a pattern like *.com, and it
-  // should imply all hosts.
-  return net::registry_controlled_domains::HostHasRegistryControlledDomain(
-      "notatld." + host_,
+  // fake URL, and check the registry. This returns 0 if the TLD is
+  // unrecognized, or the length of the recognized TLD.
+  registry_length = net::registry_controlled_domains::GetRegistryLength(
+      base::StringPrintf("foo.%s", host_.c_str()),
       net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
       net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+  // If we recognized this TLD, then this is a pattern like *.com, and it
+  // should imply all hosts. Otherwise, this doesn't imply all hosts.
+  return registry_length > 0;
 }
 
 bool URLPattern::MatchesSingleOrigin() const {
   // Strictly speaking, the port is part of the origin, but in URLPattern it
   // defaults to *. It's not very interesting anyway, so leave it out.
   return !ImpliesAllHosts() && scheme_ != "*" && !match_subdomains_;
 }
 
 bool URLPattern::MatchesPath(const std::string& test) const {
   // Make the behaviour of OverlapsWith consistent with MatchesURL, which is
@@ skipping 129 matching lines @@
   }
 
   return result;
 }
 
 // static
 const char* URLPattern::GetParseResultString(
     URLPattern::ParseResult parse_result) {
   return kParseResultMessages[parse_result];
 }