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

chrome/renderer/safe_browsing/phishing_url_feature_extractor.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/renderer/safe_browsing/phishing_url_feature_extractor.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 22 matching lines @@
     // Remove any leading/trailing dots.
     std::string host;
     base::TrimString(url.host(), ".", &host);
 
     // TODO(bryner): Ensure that the url encoding is consistent with
     // the features in the model.
 
     // Disallow unknown registries so that we don't classify
     // partial hostnames (e.g. "www.subdomain").
     size_t registry_length =
-        net::registry_controlled_domains::GetCanonicalHostRegistryLength(
-            host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+        net::registry_controlled_domains::GetRegistryLength(
+            host,
+            net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
             net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
 
     if (registry_length == 0 || registry_length == std::string::npos) {
       DVLOG(1) << "Could not find TLD for host: " << host;
       return false;
     }
     DCHECK_LT(registry_length, host.size()) << "Non-zero registry length, but "
         "host is only a TLD: " << host;
     size_t tld_start = host.size() - registry_length;
     if (!features->AddBooleanFeature(features::kUrlTldToken +
@@ skipping 53 matching lines @@
        base::SplitStringPiece(full, kTokenSeparators, base::KEEP_WHITESPACE,
                               base::SPLIT_WANT_NONEMPTY)) {
     // Copy over only the splits that are 3 or more chars long.
     // TODO(bryner): Determine a meaningful min size.
     if (token.length() >= kMinPathComponentLength)
       tokens->push_back(token.as_string());
   }
 }
 
 }  // namespace safe_browsing