Identify localhost/ipaddress in RapporSamples

chrome/browser/interstitials/security_interstitial_metrics_helper.cc

 // Copyright (c) 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 "chrome/browser/interstitials/security_interstitial_metrics_helper.h"
 
 #include <string>
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
+#include "chrome/browser/metrics/rappor/sampling.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "components/rappor/rappor_service.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
 #endif
 
@@ skipping 39 matching lines @@
       "interstitial." + uma_prefix_ + ".decision");
   base::HistogramBase* decision_histogram = base::LinearHistogram::FactoryGet(
       decision_histogram_name, 1, MAX_DECISION, MAX_DECISION + 1,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   decision_histogram->Add(decision);
 
   // Rappor
   rappor::RapporService* rappor_service = g_browser_process->rappor_service();
   if (rappor_service && rappor_reporting_ == REPORT_RAPPOR &&
       (decision == PROCEED || decision == DONT_PROCEED)) {
     // |domain| will be empty for hosts w/o TLDs (localhost, ip addrs)

[Nathan Parker, 2015/02/18 21:56:46]

Update this comment.  I think it's true still except localhost and ipaddrs.

[Steven Holte, 2015/02/19 23:42:19]

Done.

-    const std::string domain =
-        net::registry_controlled_domains::GetDomainAndRegistry(
-            request_url_,
-            net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
+    const std::string domain = rappor::GetDomainAndRegistrySampleFromGURL(
+        request_url_);
 
     // e.g. "interstitial.malware.domain" or "interstitial.ssl.domain"
     const std::string metric_name =
         "interstitial." + rappor_prefix_ + ".domain";
     rappor_service->RecordSample(metric_name, rappor::COARSE_RAPPOR_TYPE,
                                  domain);
     // TODO(nparker): Add reporting of (num_visits > 0) and decision
     // once http://crbug.com/451647 is fixed.
   }
 
@@ skipping 70 matching lines @@
 #endif
 }
 
 void SecurityInterstitialMetricsHelper::OnGotHistoryCount(
     bool success,
     int num_visits,
     base::Time first_visit) {
   if (success)
     num_visits_ = num_visits;
 }