Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/android/usb_chooser_dialog_android.cc

 // Copyright 2016 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/usb_chooser_dialog_android.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/browser/usb/web_usb_histograms.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"
 #include "content/public/browser/web_contents.h"
 #include "device/base/device_client.h"
 #include "device/usb/mojo/type_converters.h"
 #include "device/usb/usb_device.h"
 #include "device/usb/usb_device_filter.h"
 #include "device/usb/webusb_descriptors.h"
 #include "jni/UsbChooserDialog_jni.h"
@@ skipping 39 matching lines @@
       content::WebContents::FromRenderFrameHost(render_frame_host_);
   base::android::ScopedJavaLocalRef<jobject> window_android =
       content::ContentViewCore::FromWebContents(web_contents)
           ->GetWindowAndroid()
           ->GetJavaObject();
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> origin_string =
       base::android::ConvertUTF16ToJavaString(
           env, url_formatter::FormatUrlForSecurityDisplay(GURL(
                    render_frame_host->GetLastCommittedOrigin().Serialize())));
-  ChromeSecurityStateModelClient* security_model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents);
-  DCHECK(security_model_client);
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  security_model_client->GetSecurityInfo(&security_info);
+  SecurityStateTabHelper* helper =
+      SecurityStateTabHelper::FromWebContents(web_contents);
+  DCHECK(helper);
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
   java_dialog_.Reset(Java_UsbChooserDialog_create(
       env, window_android, origin_string, security_info.security_level,
       reinterpret_cast<intptr_t>(this)));
 
   if (!java_dialog_.is_null()) {
     usb_service->GetDevices(
         base::Bind(&UsbChooserDialogAndroid::GotUsbDeviceList,
                    weak_factory_.GetWeakPtr()));
   }
 }
@@ skipping 141 matching lines @@
 
   return device::FindInWebUsbAllowedOrigins(
       device->webusb_allowed_origins(),
       render_frame_host_->GetLastCommittedURL().GetOrigin());
 }
 
 // static
 bool UsbChooserDialogAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }