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

extensions/common/csp_validator.cc

 // Copyright 2013 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/csp_validator.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 100 matching lines @@
 
   if (!is_wildcard_subdomain || !should_check_rcd)
     return true;
 
   // Allow *.googleapis.com to be whitelisted for backwards-compatibility.
   // (crbug.com/409952)
   if (host == "googleapis.com")
     return true;
 
   // Wildcards on subdomains of a TLD are not allowed.
-  return net::registry_controlled_domains::HostHasRegistryControlledDomain(
-      host, net::registry_controlled_domains::INCLUDE_UNKNOWN_REGISTRIES,
+  size_t registry_length = net::registry_controlled_domains::GetRegistryLength(
+      host,
+      net::registry_controlled_domains::INCLUDE_UNKNOWN_REGISTRIES,
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
+  return registry_length != 0;
 }
 
 // Checks whether the source is a syntactically valid hash.
 bool IsHashSource(const std::string& source) {
   size_t hash_end = source.length() - 1;
   if (source.empty() || source[hash_end] != '\'') {
     return false;
   }
 
   for (const char* prefix : kHashSourcePrefixes) {
@@ skipping 233 matching lines @@
       }
     }
   }
 
   return seen_sandbox;
 }
 
 }  // namespace csp_validator
 
 }  // namespace extensions