Refactor SecurityStateModel/Clients for simplicity and reusability.

ios/chrome/browser/ssl/ios_security_state_tab_helper.mm

Index: ios/chrome/browser/ssl/ios_security_state_tab_helper.mm
diff --git a/ios/chrome/browser/ssl/ios_chrome_security_state_model_client.mm b/ios/chrome/browser/ssl/ios_security_state_tab_helper.mm
similarity index 53%
rename from ios/chrome/browser/ssl/ios_chrome_security_state_model_client.mm
rename to ios/chrome/browser/ssl/ios_security_state_tab_helper.mm
index 05a14fc1d5c5b497183636732be8014290a3b645..4b84bc33ca146c05e217e961364906cb66044b8b 100644
--- a/ios/chrome/browser/ssl/ios_chrome_security_state_model_client.mm
+++ b/ios/chrome/browser/ssl/ios_security_state_tab_helper.mm
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/chrome/browser/ssl/ios_chrome_security_state_model_client.h"
+#include "ios/chrome/browser/ssl/ios_security_state_tab_helper.h"
 
+#include "base/bind.h"
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
+#include "components/security_state/core/security_state.h"
 #include "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #import "ios/web/public/origin_util.h"
@@ -15,38 +18,28 @@
 #include "ios/web/public/web_state/web_state.h"
 #include "net/cert/x509_certificate.h"
 
-DEFINE_WEB_STATE_USER_DATA_KEY(IOSChromeSecurityStateModelClient);
+DEFINE_WEB_STATE_USER_DATA_KEY(IOSSecurityStateTabHelper);
 
-IOSChromeSecurityStateModelClient::IOSChromeSecurityStateModelClient(
-    web::WebState* web_state)
-    : web_state_(web_state),
-      security_state_model_(new security_state::SecurityStateModel()) {
-  security_state_model_->SetClient(this);
-}
-
-IOSChromeSecurityStateModelClient::~IOSChromeSecurityStateModelClient() {}
+IOSSecurityStateTabHelper::IOSSecurityStateTabHelper(web::WebState* web_state)

[rohitrao (ping after 24h), 2016/11/04 14:07:01]

Where does the desktop code create and attach its version of this TabHelper? 
I'll need to do something similar on iOS.

[Eric Seckler, 2016/11/04 14:17:56]

The iOS version is created by calling the static method CreateForWebState. On
desktop, the equivalent happens here:

https://cs.chromium.org/chromium/src/chrome/browser/ui/tab_helpers.cc?l=187&dr=C

+    : web_state_(web_state) {}
 
-void IOSChromeSecurityStateModelClient::GetSecurityInfo(
-    security_state::SecurityStateModel::SecurityInfo* result) const {
-  return security_state_model_->GetSecurityInfo(result);
-}
+IOSSecurityStateTabHelper::~IOSSecurityStateTabHelper() {}
 
-bool IOSChromeSecurityStateModelClient::UsedPolicyInstalledCertificate() {
-  return false;
+void IOSSecurityStateTabHelper::GetSecurityInfo(
+    security_state::SecurityInfo* result) const {
+  security_state::GetSecurityInfo(GetVisibleSecurityState(),
+                                  false /* used policy installed certificate */,
+                                  base::Bind(&web::IsOriginSecure), result);
 }
 
-bool IOSChromeSecurityStateModelClient::IsOriginSecure(const GURL& url) {
-  return web::IsOriginSecure(url);
-}
+std::unique_ptr<security_state::VisibleSecurityState>
+IOSSecurityStateTabHelper::GetVisibleSecurityState() const {
+  auto state = base::MakeUnique<security_state::VisibleSecurityState>();
 
-void IOSChromeSecurityStateModelClient::GetVisibleSecurityState(
-    security_state::SecurityStateModel::VisibleSecurityState* state) {
   web::NavigationItem* item =
       web_state_->GetNavigationManager()->GetVisibleItem();
-  if (!item || item->GetSSL().security_style == web::SECURITY_STYLE_UNKNOWN) {
-    *state = security_state::SecurityStateModel::VisibleSecurityState();
-    return;
-  }
+  if (!item || item->GetSSL().security_style == web::SECURITY_STYLE_UNKNOWN)
+    return state;
 
   state->connection_info_initialized = true;
   state->url = item->GetURL();
@@ -58,4 +51,5 @@ void IOSChromeSecurityStateModelClient::GetVisibleSecurityState(
   state->displayed_mixed_content =
       (ssl.content_status & web::SSLStatus::DISPLAYED_INSECURE_CONTENT) ? true
                                                                         : false;
+  return state;
 }