Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ssl/security_state_model_android.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/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"
 
 using base::android::JavaParamRef;
 
 // static
 bool RegisterSecurityStateModelAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 jint GetSecurityLevelForWebContents(
     JNIEnv* env,
     const JavaParamRef<jclass>& jcaller,
     const JavaParamRef<jobject>& jweb_contents) {
   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;
 }
 
 // static
 jboolean IsDeprecatedSHA1Present(JNIEnv* env,
                                  const JavaParamRef<jclass>& jcaller,
                                  const JavaParamRef<jobject>& jweb_contents) {
   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
 jboolean IsPassiveMixedContentPresent(
     JNIEnv* env,
     const JavaParamRef<jclass>& jcaller,
     const JavaParamRef<jobject>& jweb_contents) {
   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;
 }