Simplify security_interstitials::ControllerClient and other related classes

chrome/browser/ssl/bad_clock_blocking_page.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 "chrome/browser/ssl/bad_clock_blocking_page.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 18 matching lines @@
 #include "net/base/net_errors.h"
 
 using content::InterstitialPageDelegate;
 using content::NavigationController;
 using content::NavigationEntry;
 
 namespace {
 
 const char kMetricsName[] = "bad_clock";
 
+std::unique_ptr<ChromeMetricsHelper> CreateMetricsHelper(
+    content::WebContents* web_contents,
+    const GURL& request_url) {
+  // Set up the metrics helper for the BadClockUI.
+  security_interstitials::MetricsHelper::ReportDetails reporting_info;
+  reporting_info.metric_prefix = kMetricsName;
+  std::unique_ptr<ChromeMetricsHelper> metrics_helper =
+      base::MakeUnique<ChromeMetricsHelper>(web_contents, request_url,
+                                            reporting_info, kMetricsName);
+  metrics_helper.get()->StartRecordingCaptivePortalMetrics(false);
+  return metrics_helper;
+}
+
 }  // namespace
 
 // static
 InterstitialPageDelegate::TypeID BadClockBlockingPage::kTypeForTesting =
     &BadClockBlockingPage::kTypeForTesting;
 
 // Note that we always create a navigation entry with SSL errors.
 // No error happening loading a sub-resource triggers an interstitial so far.
 // Creating an interstitial without showing (e.g. from chrome://interstitials)
 // it leaks memory, so don't create it here.
 BadClockBlockingPage::BadClockBlockingPage(
     content::WebContents* web_contents,
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
     const base::Time& time_triggered,
     ssl_errors::ClockState clock_state,
     std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
     const base::Callback<void(content::CertificateRequestResultType)>& callback)
-    : SecurityInterstitialPage(web_contents, request_url),
+    : SecurityInterstitialPage(web_contents,
+                               request_url,
+                               CreateMetricsHelper(web_contents, request_url)),
       callback_(callback),
       ssl_info_(ssl_info),
       time_triggered_(time_triggered) {
-  // Set up the metrics helper for the BadClockUI.
-  security_interstitials::MetricsHelper::ReportDetails reporting_info;
-  reporting_info.metric_prefix = kMetricsName;
-  ChromeMetricsHelper* chrome_metrics_helper = new ChromeMetricsHelper(
-      web_contents, request_url, reporting_info, kMetricsName);
-  chrome_metrics_helper->StartRecordingCaptivePortalMetrics(false);
-  std::unique_ptr<security_interstitials::MetricsHelper> metrics_helper(
-      chrome_metrics_helper);
-  controller()->set_metrics_helper(std::move(metrics_helper));
-
   cert_report_helper_.reset(new CertReportHelper(
       std::move(ssl_cert_reporter), web_contents, request_url, ssl_info,
       certificate_reporting::ErrorReport::INTERSTITIAL_CLOCK,
       false /* overridable */, controller()->metrics_helper()));
 
   bad_clock_ui_.reset(new security_interstitials::BadClockUI(
       request_url, cert_error, ssl_info, time_triggered, clock_state,
       controller()));
 }
 
@@ skipping 68 matching lines @@
 void BadClockBlockingPage::NotifyDenyCertificate() {
   // It's possible that callback_ may not exist if the user clicks "Proceed"
   // followed by pressing the back button before the interstitial is hidden.
   // In that case the certificate will still be treated as allowed.
   if (callback_.is_null())
     return;
 
   base::ResetAndReturn(&callback_)
       .Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
 }