Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ssl/captive_portal_blocking_page_browsertest.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/captive_portal_blocking_page.h"
 
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
 #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"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/captive_portal/captive_portal_detector.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 131 matching lines @@
                                            wifi_ssid));
   }
   EXPECT_EQ(expect_login_url == EXPECT_LOGIN_URL_YES,
             IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                          expected_login_hostname));
   EXPECT_EQ(expect_login_url == EXPECT_LOGIN_URL_NO,
             IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                          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);
   EXPECT_EQ(security_state::SecurityStateModel::DANGEROUS,
             security_info.security_level);
 }
 
 void CaptivePortalBlockingPageTest::TestInterstitial(
     bool is_wifi_connection,
     const std::string& wifi_ssid,
@@ skipping 153 matching lines @@
             false, "");
     return blocking_page;
   }
 };
 
 // Test that an IDN login domain is decoded properly.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest,
                        ShowLoginIDNIfPortalRedirectsDetectionURL) {
   EXPECT_TRUE(VerifyIDNDecoded());
 }