Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ssl/security_state_model_android.cc

Index: chrome/browser/ssl/security_state_model_android.cc
diff --git a/chrome/browser/ssl/security_state_model_android.cc b/chrome/browser/ssl/security_state_model_android.cc
index c39fefac88db28af4335f1f5394a60e119720ddf..99145b5e820735485231554f40f0142d9e56ee8e 100644
--- a/chrome/browser/ssl/security_state_model_android.cc
+++ b/chrome/browser/ssl/security_state_model_android.cc
@@ -5,7 +5,8 @@
 #include "chrome/browser/ssl/security_state_model_android.h"
 
 #include "base/logging.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/security_state_tab_helper.h"
+#include "components/security_state/core/security_state.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/SecurityStateModel_jni.h"
 
@@ -24,12 +25,12 @@ jint GetSecurityLevelForWebContents(
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
-  ChromeSecurityStateModelClient::CreateForWebContents(web_contents);
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents);
-  DCHECK(model_client);
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  model_client->GetSecurityInfo(&security_info);
+  SecurityStateTabHelper::CreateForWebContents(web_contents);
+  SecurityStateTabHelper* helper =
+      SecurityStateTabHelper::FromWebContents(web_contents);
+  DCHECK(helper);
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
   return security_info.security_level;
 }
 
@@ -40,14 +41,14 @@ jboolean IsDeprecatedSHA1Present(JNIEnv* env,
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
-  ChromeSecurityStateModelClient::CreateForWebContents(web_contents);
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents);
-  DCHECK(model_client);
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  model_client->GetSecurityInfo(&security_info);
+  SecurityStateTabHelper::CreateForWebContents(web_contents);
+  SecurityStateTabHelper* helper =
+      SecurityStateTabHelper::FromWebContents(web_contents);
+  DCHECK(helper);
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
   return security_info.sha1_deprecation_status !=
-         security_state::SecurityStateModel::NO_DEPRECATED_SHA1;
+         security_state::NO_DEPRECATED_SHA1;
 }
 
 // static
@@ -58,15 +59,14 @@ jboolean IsPassiveMixedContentPresent(
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
-  ChromeSecurityStateModelClient::CreateForWebContents(web_contents);
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents);
-  DCHECK(model_client);
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  model_client->GetSecurityInfo(&security_info);
+  SecurityStateTabHelper::CreateForWebContents(web_contents);
+  SecurityStateTabHelper* helper =
+      SecurityStateTabHelper::FromWebContents(web_contents);
+  DCHECK(helper);
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
   return security_info.mixed_content_status ==
-             security_state::SecurityStateModel::CONTENT_STATUS_DISPLAYED ||
+             security_state::CONTENT_STATUS_DISPLAYED ||
          security_info.mixed_content_status ==
-             security_state::SecurityStateModel::
-                 CONTENT_STATUS_DISPLAYED_AND_RAN;
+             security_state::CONTENT_STATUS_DISPLAYED_AND_RAN;
 }