Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

Index: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
index c6f5277f5a60581012f5ac317f2ce18f7b826a3b..eb6a7af55d60570ee37acbc7eeb21b2e60fea205 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/cert_report_helper.h"
 #include "chrome/browser/ssl/certificate_reporting_test_utils.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/chrome_security_state_model.h"
 #include "chrome/browser/ssl/ssl_cert_reporter.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -168,8 +168,8 @@ void CaptivePortalBlockingPageTest::TestInterstitial(
                                          kGenericLoginURLText));
 
   // Check that a red/dangerous lock icon is showing on the interstitial.
-  ChromeSecurityStateModelClient* security_model =
-      ChromeSecurityStateModelClient::FromWebContents(contents);
+  ChromeSecurityStateModel* security_model =
+      ChromeSecurityStateModel::FromWebContents(contents);
   ASSERT_TRUE(security_model);
   security_state::SecurityStateModel::SecurityInfo security_info;
   security_model->GetSecurityInfo(&security_info);