Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/android/page_info/website_settings_popup_android.cc

 // Copyright (c) 2013 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/page_info/website_settings_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/stl_util.h"
 #include "chrome/browser/infobars/infobar_service.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/ui/website_settings/website_settings.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "components/security_state/core/security_state.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/WebsiteSettingsPopup_jni.h"
 
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 
@@ skipping 16 matching lines @@
   // Important to use GetVisibleEntry to match what's showing in the omnibox.
   content::NavigationEntry* nav_entry =
       web_contents->GetController().GetVisibleEntry();
   if (nav_entry == NULL)
     return;
 
   url_ = nav_entry->GetURL();
 
   popup_jobject_.Reset(env, java_website_settings_pop);
 
-  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);
 
   presenter_.reset(new WebsiteSettings(
       this, Profile::FromBrowserContext(web_contents->GetBrowserContext()),
       TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
       nav_entry->GetURL(), security_info));
 }
 
 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {}
 
 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env,
@@ skipping 83 matching lines @@
     WebsiteSettingsUI::TabId tab_id) {
   // There's no tab UI on Android - only connection info is shown.
   NOTIMPLEMENTED();
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }