Split captive portal metrics out of SSLErrorClassification

chrome/browser/safe_browsing/safe_browsing_blocking_page.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.
 //
 // Implementation of the SafeBrowsingBlockingPage class.
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
 #include <string>
 
@@ skipping 154 matching lines @@
     interstitial_reason_ = SB_REASON_HARMFUL;
   else
     interstitial_reason_ = SB_REASON_PHISHING;
 
   // This must be done after calculating |interstitial_reason_| above.
   security_interstitials::MetricsHelper::ReportDetails reporting_info;
   reporting_info.metric_prefix = GetMetricPrefix();
   reporting_info.extra_suffix = GetExtraMetricsSuffix();
   reporting_info.rappor_prefix = GetRapporPrefix();
   reporting_info.rappor_report_type = rappor::SAFEBROWSING_RAPPOR_TYPE;
-  set_metrics_helper(new ChromeMetricsHelper(
-      web_contents, request_url(), reporting_info, GetSamplingEventName()));
+  set_metrics_helper(
+      scoped_ptr<ChromeMetricsHelper>(

[estark, 2015/09/25 23:53:34]

optional nit: you can also use make_scoped_ptr() to save a few chars

[felt, 2015/09/27 20:08:15]

Done.

+          new ChromeMetricsHelper(web_contents, request_url(), reporting_info,
+                                  GetSamplingEventName()))
+          .Pass());
   metrics_helper()->RecordUserDecision(
       security_interstitials::MetricsHelper::SHOW);
   metrics_helper()->RecordUserInteraction(
       security_interstitials::MetricsHelper::TOTAL_VISITS);
   if (IsPrefEnabled(prefs::kSafeBrowsingProceedAnywayDisabled)) {
     metrics_helper()->RecordUserDecision(
         security_interstitials::MetricsHelper::PROCEEDING_DISABLED);
   }
 
   if (!is_main_frame_load_blocked_) {
@@ skipping 520 matching lines @@
         "finalParagraph", l10n_util::GetStringUTF16(
                               IDS_PHISHING_V4_PROCEED_AND_REPORT_PARAGRAPH));
   } else {
     load_time_data->SetString(
         "finalParagraph",
         l10n_util::GetStringUTF16(IDS_PHISHING_V3_PROCEED_PARAGRAPH));
   }
 
   PopulateExtendedReportingOption(load_time_data);
 }