Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/android/bluetooth_chooser_android.cc

Index: chrome/browser/ui/android/bluetooth_chooser_android.cc
diff --git a/chrome/browser/ui/android/bluetooth_chooser_android.cc b/chrome/browser/ui/android/bluetooth_chooser_android.cc
index d872f2617f2bc3e2105f060a4476968da94921f9..a15fe998ca7f6a4b1b06934cbecd21850a5a750f 100644
--- a/chrome/browser/ui/android/bluetooth_chooser_android.cc
+++ b/chrome/browser/ui/android/bluetooth_chooser_android.cc
@@ -7,8 +7,9 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/common/url_constants.h"
+#include "components/security_state/core/security_state.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/render_frame_host.h"
@@ -36,17 +37,17 @@ BluetoothChooserAndroid::BluetoothChooserAndroid(
           ->GetWindowAndroid()
           ->GetJavaObject();
 
-  ChromeSecurityStateModelClient* security_model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents_);
-  DCHECK(security_model_client);
+  SecurityStateTabHelper* helper =
+      SecurityStateTabHelper::FromWebContents(web_contents_);
+  DCHECK(helper);
 
   // Create (and show) the BluetoothChooser dialog.
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> origin_string =
       base::android::ConvertUTF16ToJavaString(
           env, url_formatter::FormatUrlForSecurityDisplay(origin.GetURL()));
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  security_model_client->GetSecurityInfo(&security_info);
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
   java_dialog_.Reset(Java_BluetoothChooserDialog_create(
       env, window_android, origin_string, security_info.security_level,
       reinterpret_cast<intptr_t>(this)));