Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index b2a18ddde0706b08c554de4b418336d169a9184b..48621e70511a9388b9bdb9477acf87bfb66952b0 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -26,7 +26,7 @@
 #include "chrome/browser/safe_browsing/threat_details.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/ssl/cert_verifier_browser_test.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_blocking_page.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ -569,11 +569,11 @@ class SafeBrowsingBlockingPageBrowserTest
 
   void ExpectSecurityIndicatorDowngrade(content::WebContents* tab,
                                         net::CertStatus cert_status) {
-    ChromeSecurityStateModelClient* model_client =
-        ChromeSecurityStateModelClient::FromWebContents(tab);
-    ASSERT_TRUE(model_client);
+    ChromeSecurityStateModel* model =
+        ChromeSecurityStateModel::FromWebContents(tab);
+    ASSERT_TRUE(model);
     security_state::SecurityStateModel::SecurityInfo security_info;
-    model_client->GetSecurityInfo(&security_info);
+    model->GetSecurityInfo(&security_info);
     EXPECT_EQ(security_state::SecurityStateModel::DANGEROUS,
               security_info.security_level);
     EXPECT_TRUE(security_info.fails_malware_check);