Add support for split Public Suffix List distinctions.

chrome/renderer/safe_browsing/phishing_dom_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_dom_feature_extractor.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
@@ skipping 368 matching lines @@
   cur_document_.reset();
 }
 
 void PhishingDOMFeatureExtractor::ResetFrameData() {
   DCHECK(!cur_document_.isNull());
   DCHECK(!cur_frame_data_.get());
 
   cur_frame_data_.reset(new FrameData());
   cur_frame_data_->elements = cur_document_.all();
   cur_frame_data_->domain =
-      net::RegistryControlledDomainService::GetDomainAndRegistry(
-          cur_document_.url());
+      net::registry_controlled_domains::GetDomainAndRegistry(
+          cur_document_.url(),
+          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
 }
 
 WebKit::WebDocument PhishingDOMFeatureExtractor::GetNextDocument() {
   DCHECK(!cur_document_.isNull());
   WebKit::WebFrame* frame = cur_document_.frame();
   // Advance to the next frame that contains a document, with no wrapping.
   if (frame) {
     while ((frame = frame->traverseNext(false))) {
       if (!frame->document().isNull()) {
         return frame->document();
@@ skipping 14 matching lines @@
 
   if (cur_frame_data_->domain.empty()) {
     return false;
   }
 
   // TODO(bryner): Ensure that the url encoding is consistent with the features
   // in the model.
   if (url.HostIsIPAddress()) {
     domain->assign(url.host());
   } else {
-    domain->assign(net::RegistryControlledDomainService::GetDomainAndRegistry(
-        url));
+    domain->assign(net::registry_controlled_domains::GetDomainAndRegistry(
+        url, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES));
   }
 
   return !domain->empty() && *domain != cur_frame_data_->domain;
 }
 
 void PhishingDOMFeatureExtractor::InsertFeatures() {
   DCHECK(page_feature_state_.get());
 
   if (page_feature_state_->total_links > 0) {
     // Add a feature for the fraction of times the page links to an external
@@ skipping 53 matching lines @@
   // Record number of script tags (discretized for numerical stability.)
   if (page_feature_state_->num_script_tags > 1) {
     features_->AddBooleanFeature(features::kPageNumScriptTagsGTOne);
     if (page_feature_state_->num_script_tags > 6) {
       features_->AddBooleanFeature(features::kPageNumScriptTagsGTSix);
     }
   }
 }
 
 }  // namespace safe_browsing