Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/android/bluetooth_chooser_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/ui/android/bluetooth_chooser_android.h"
 
 #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/chrome_security_state_model.h"
 #include "chrome/common/url_constants.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"
 #include "jni/BluetoothChooserDialog_jni.h"
 #include "ui/android/window_android.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 BluetoothChooserAndroid::BluetoothChooserAndroid(
     content::RenderFrameHost* frame,
     const EventHandler& event_handler)
     : web_contents_(content::WebContents::FromRenderFrameHost(frame)),
       event_handler_(event_handler) {
   const url::Origin origin = frame->GetLastCommittedOrigin();
   DCHECK(!origin.unique());
 
   base::android::ScopedJavaLocalRef<jobject> window_android =
       content::ContentViewCore::FromWebContents(web_contents_)
           ->GetWindowAndroid()
           ->GetJavaObject();
 
-  ChromeSecurityStateModelClient* security_model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents_);
-  DCHECK(security_model_client);
+  ChromeSecurityStateModel* security_model =
+      ChromeSecurityStateModel::FromWebContents(web_contents_);
+  DCHECK(security_model);
 
   // 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_model->GetSecurityInfo(&security_info);
   java_dialog_.Reset(Java_BluetoothChooserDialog_create(
       env, window_android, origin_string, security_info.security_level,
       reinterpret_cast<intptr_t>(this)));
 }
 
 BluetoothChooserAndroid::~BluetoothChooserAndroid() {
   if (!java_dialog_.is_null()) {
     Java_BluetoothChooserDialog_closeDialog(AttachCurrentThread(),
                                             java_dialog_);
   }
@@ skipping 110 matching lines @@
 // static
 bool BluetoothChooserAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void BluetoothChooserAndroid::OpenURL(const char* url) {
   web_contents_->OpenURL(content::OpenURLParams(
       GURL(url), content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */));
 }