Simplify security_interstitials::ControllerClient and other related classes

ios/chrome/browser/ssl/ios_ssl_blocking_page.mm

 // Copyright 2016 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 "ios/chrome/browser/ssl/ios_ssl_blocking_page.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 47 matching lines @@
   if (overridable) {
     UMA_HISTOGRAM_ENUMERATION(
         "interstitial.ssl.expiration_and_decision.overridable", event,
         END_OF_SSL_EXPIRATION_AND_DECISION);
   } else {
     UMA_HISTOGRAM_ENUMERATION(
         "interstitial.ssl.expiration_and_decision.nonoverridable", event,
         END_OF_SSL_EXPIRATION_AND_DECISION);
   }
 }
+
+IOSChromeMetricsHelper* CreateMetricsHelper(web::WebState* web_state,
+                                            const GURL& request_url,
+                                            bool overridable) {
+  // Set up the metrics helper for the SSLErrorUI.
+  security_interstitials::MetricsHelper::ReportDetails reporting_info;
+  reporting_info.metric_prefix =
+      overridable ? "ssl_overridable" : "ssl_nonoverridable";
+  reporting_info.rappor_prefix = kSSLRapporPrefix;
+  reporting_info.deprecated_rappor_prefix = kDeprecatedSSLRapporPrefix;
+  reporting_info.rappor_report_type = rappor::LOW_FREQUENCY_UMA_RAPPOR_TYPE;
+  reporting_info.deprecated_rappor_report_type = rappor::UMA_RAPPOR_TYPE;
+  return new IOSChromeMetricsHelper(web_state, request_url, reporting_info);
+}
+
 }  // namespace
 
 // Note that we always create a navigation entry with SSL errors.
 // No error happening loading a sub-resource triggers an interstitial so far.
 IOSSSLBlockingPage::IOSSSLBlockingPage(
     web::WebState* web_state,
     int cert_error,
     const net::SSLInfo& ssl_info,
     const GURL& request_url,
     int options_mask,
     const base::Time& time_triggered,
     const base::Callback<void(bool)>& callback)
     : IOSSecurityInterstitialPage(web_state, request_url),
       callback_(callback),
       ssl_info_(ssl_info),
       overridable_(IsOverridable(options_mask)),
       expired_but_previously_allowed_(
           (options_mask & SSLErrorUI::EXPIRED_BUT_PREVIOUSLY_ALLOWED) != 0),
-      controller_(new IOSChromeControllerClient(web_state)) {
+      controller_(new IOSChromeControllerClient(
+          web_state,
+          base::WrapUnique(CreateMetricsHelper(web_state,
+                                               request_url,
+                                               IsOverridable(options_mask))))) {
   // Override prefs for the SSLErrorUI.
   if (overridable_)
     options_mask |= SSLErrorUI::SOFT_OVERRIDE_ENABLED;
   else
     options_mask &= ~SSLErrorUI::SOFT_OVERRIDE_ENABLED;
 
-  // Set up the metrics helper for the SSLErrorUI.
-  security_interstitials::MetricsHelper::ReportDetails reporting_info;
-  reporting_info.metric_prefix =
-      overridable_ ? "ssl_overridable" : "ssl_nonoverridable";
-  reporting_info.rappor_prefix = kSSLRapporPrefix;
-  reporting_info.deprecated_rappor_prefix = kDeprecatedSSLRapporPrefix;
-  reporting_info.rappor_report_type = rappor::LOW_FREQUENCY_UMA_RAPPOR_TYPE;
-  reporting_info.deprecated_rappor_report_type = rappor::UMA_RAPPOR_TYPE;
-  IOSChromeMetricsHelper* ios_chrome_metrics_helper =
-      new IOSChromeMetricsHelper(web_state, request_url, reporting_info);
-  controller_->set_metrics_helper(base::WrapUnique(ios_chrome_metrics_helper));
-
   ssl_error_ui_.reset(new SSLErrorUI(request_url, cert_error, ssl_info,
                                      options_mask, time_triggered,
                                      controller_.get()));
 
   // Creating an interstitial without showing (e.g. from chrome://interstitials)
   // it leaks memory, so don't create it here.
 }
 
 bool IOSSSLBlockingPage::ShouldCreateNewNavigation() const {
   return true;
@@ skipping 89 matching lines @@
   // In that case the certificate will still be treated as allowed.
   if (callback_.is_null())
     return;
 
   callback_.Run(false);
   callback_.Reset();
 }
 
 // static
 bool IOSSSLBlockingPage::IsOverridable(int options_mask) {
-  const bool is_overridable =
-      (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) &&
-      !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT);
-  return is_overridable;
+  return (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) &&
+         !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT);
 }