Simplify security_interstitials::ControllerClient and other related classes

chrome/browser/ssl/captive_portal_blocking_page.cc

Index: chrome/browser/ssl/captive_portal_blocking_page.cc
diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser/ssl/captive_portal_blocking_page.cc
index 542a5b42532c868035b70bac2fa37d7f405157db..6cd2d947ff3aebb36e06843e802f3ac6c7bbcf84 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
@@ -21,6 +21,7 @@
 #include "components/certificate_reporting/error_reporter.h"
 #include "components/security_interstitials/core/common_string_util.h"
 #include "components/security_interstitials/core/controller_client.h"
+#include "components/security_interstitials/core/metrics_helper.h"
 #include "components/url_formatter/url_formatter.h"
 #include "components/wifi/wifi_service.h"
 #include "content/public/browser/web_contents.h"
@@ -56,7 +57,7 @@ CaptivePortalBlockingPage::CaptivePortalBlockingPage(
     std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
     const net::SSLInfo& ssl_info,
     const base::Callback<void(content::CertificateRequestResultType)>& callback)
-    : SecurityInterstitialPage(web_contents, request_url),
+    : SecurityInterstitialPage(web_contents, request_url, nullptr),

[felt, 2016/09/06 20:33:19]

did you intend to add a metrics helper here (since you added the include above)?

[meacer, 2016/09/06 20:40:16]

I'm doing that in a follow up CL: https://codereview.chromium.org/2302623002/

[felt, 2016/09/07 00:06:12]

can you remove the unnecessary include then from this CL? thx

       login_url_(login_url),
       callback_(callback) {
   DCHECK(login_url_.is_valid());