Add a low-frequency RAPPOR configuration, and use it for Safe Browsing and Permissions metrics.

components/security_interstitials/core/metrics_helper.cc

 // Copyright 2015 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 "components/security_interstitials/core/metrics_helper.h"
 
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/user_metrics.h"
@@ skipping 95 matching lines @@
 }  // namespace
 
 MetricsHelper::~MetricsHelper() {}
 
 MetricsHelper::ReportDetails::ReportDetails()
     : rappor_report_type(rappor::NUM_RAPPOR_TYPES) {}
 
 MetricsHelper::ReportDetails::ReportDetails(const ReportDetails& other) =
     default;
 
+MetricsHelper::ReportDetails::~ReportDetails() {}
+
 MetricsHelper::MetricsHelper(
   const GURL& request_url,
   const ReportDetails settings,
   history::HistoryService* history_service,
   const base::WeakPtr<rappor::RapporService>& rappor_service)
     : request_url_(request_url),
       settings_(settings),
       rappor_service_(rappor_service),
       num_visits_(-1) {
   DCHECK(!settings_.metric_prefix.empty());
@@ skipping 14 matching lines @@
   RecordUserDecisionToMetrics(decision, histogram_name);
   // Record additional information about sites that users have visited before.
   // Report |decision| and SHOW together, filtered by the same history state
   // so they they are paired regardless of when if num_visits_ is populated.
   if (num_visits_ > 0 && (decision == PROCEED || decision == DONT_PROCEED)) {
     RecordUserDecisionToMetrics(SHOW, histogram_name + ".repeat_visit");
     RecordUserDecisionToMetrics(decision, histogram_name + ".repeat_visit");
   }
 
   MaybeRecordDecisionAsAction(decision, settings_.metric_prefix);
-  RecordUserDecisionToRappor(decision);
+  RecordUserDecisionToRappor(decision, settings_.rappor_report_type,
+                             settings_.rappor_prefix);
+  RecordUserDecisionToRappor(decision, settings_.deprecated_rappor_report_type,
+                             settings_.deprecated_rappor_prefix);
   RecordExtraUserDecisionMetrics(decision);
 }
 
 void MetricsHelper::RecordUserDecisionToMetrics(
     Decision decision,
     const std::string& histogram_name) {
   // Record the decision, and additionally |with extra_suffix|.
   RecordSingleDecisionToMetrics(decision, histogram_name);
   if (!settings_.extra_suffix.empty()) {
     RecordSingleDecisionToMetrics(
         decision, histogram_name + "." + settings_.extra_suffix);
   }
 }
 
-void MetricsHelper::RecordUserDecisionToRappor(Decision decision) {
+void MetricsHelper::RecordUserDecisionToRappor(
+    Decision decision,
+    const rappor::RapporType rappor_report_type,
+    const std::string& rappor_prefix) {
   if (!rappor_service_ || (decision != PROCEED && decision != DONT_PROCEED))
     return;
 
   scoped_ptr<rappor::Sample> sample =
-      rappor_service_->CreateSample(settings_.rappor_report_type);
+      rappor_service_->CreateSample(rappor_report_type);
 
-  // This will populate, for example, "intersitial.malware.domain" or
-  // "interstitial.ssl2.domain".  |domain| will be empty for hosts w/o TLDs.
+  // This will populate, for example, "intersitial.malware2.domain" or
+  // "interstitial.ssl3.domain". |domain| will be empty for hosts w/o TLDs.
   const std::string domain =
       rappor::GetDomainAndRegistrySampleFromGURL(request_url_);
   sample->SetStringField("domain", domain);
 
   // Only report history and decision if we have history data.
   if (num_visits_ >= 0) {
     int flags = 0;
     if (decision == PROCEED)
       flags |= 1 << InterstitialFlagBits::DID_PROCEED;
     if (num_visits_ > 0)
       flags |= 1 << InterstitialFlagBits::IS_REPEAT_VISIT;
     // e.g. "interstitial.malware.flags"
     sample->SetFlagsField("flags", flags,
                           InterstitialFlagBits::HIGHEST_USED_BIT + 1);
   }
-  rappor_service_->RecordSampleObj("interstitial." + settings_.rappor_prefix,
+  rappor_service_->RecordSampleObj("interstitial." + rappor_prefix,
                                    std::move(sample));
 }
 
 void MetricsHelper::RecordUserInteraction(Interaction interaction) {
   const std::string histogram_name(
       "interstitial." + settings_.metric_prefix + ".interaction");
   RecordSingleInteractionToMetrics(interaction, histogram_name);
   if (!settings_.extra_suffix.empty()) {
     RecordSingleInteractionToMetrics(
         interaction, histogram_name + "." + settings_.extra_suffix);
@@ skipping 12 matching lines @@
 }
 
 void MetricsHelper::OnGotHistoryCount(bool success,
                                       int num_visits,
                                       base::Time /*first_visit*/) {
   if (success)
     num_visits_ = num_visits;
 }
 
 }  // namespace security_interstitials