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

extensions/common/permissions/permission_message_util.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 "extensions/common/permissions/permission_message_util.h"
 
 #include <stddef.h>
 #include <vector>
 
 #include "base/strings/string_split.h"
@@ skipping 33 matching lines @@
     if (exclude_file_scheme && pattern.scheme() == url::kFileScheme)
       continue;
 
     std::string host = pattern.host();
 
     // Add the subdomain wildcard back to the host, if necessary.
     if (pattern.match_subdomains())
       host = "*." + host;
 
     // If the host has an RCD, split it off so we can detect duplicates.
-
     std::string rcd;
-    size_t reg_len =
-        net::registry_controlled_domains::PermissiveGetHostRegistryLength(
-            host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-            net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+    size_t reg_len = net::registry_controlled_domains::GetRegistryLength(
+        host,
+        net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+        net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
     if (reg_len && reg_len != std::string::npos) {
       if (include_rcd)  // else leave rcd empty
         rcd = host.substr(host.size() - reg_len);
       host = host.substr(0, host.size() - reg_len);
     }
 
     // Check if we've already seen this host.
     HostVector::iterator it = hosts_best_rcd.begin();
     for (; it != hosts_best_rcd.end(); ++it) {
       if (it->first == host)
         break;
     }
     // If this host was found, replace the RCD if this one is better.
     if (it != hosts_best_rcd.end()) {
       if (include_rcd && RcdBetterThan(rcd, it->second))
         it->second = rcd;
     } else {  // Previously unseen host, append it.
       hosts_best_rcd.push_back(std::make_pair(host, rcd));
     }
   }
 
   // Build up the result by concatenating hosts and RCDs.
   std::set<std::string> distinct_hosts;
   for (const auto& host_rcd : hosts_best_rcd)
     distinct_hosts.insert(host_rcd.first + host_rcd.second);
   return distinct_hosts;
 }
 
 }  // namespace permission_message_util