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 59%
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..13ef5775ea3c1c259ec8a44072970573223340ec 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,9 +2,11 @@
 // 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 "ios/web/public/navigation_item.h"
@@ -15,38 +17,34 @@
 #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)
+IOSSecurityStateTabHelper::IOSSecurityStateTabHelper(web::WebState* web_state)
     : web_state_(web_state),
-      security_state_model_(new security_state::SecurityStateModel()) {
-  security_state_model_->SetClient(this);
-}
+      security_state_model_(new security_state::SecurityStateModel()) {}
 
-IOSChromeSecurityStateModelClient::~IOSChromeSecurityStateModelClient() {}
+IOSSecurityStateTabHelper::~IOSSecurityStateTabHelper() {}
 
-void IOSChromeSecurityStateModelClient::GetSecurityInfo(
+void IOSSecurityStateTabHelper::GetSecurityInfo(
     security_state::SecurityStateModel::SecurityInfo* result) const {
-  return security_state_model_->GetSecurityInfo(result);
+  security_state_model_->GetSecurityInfo(result, GetVisibleSecurityState(),
+                                         UsedPolicyInstalledCertificate(),

[estark, 2016/11/03 04:38:45]

nit:
`false /* used policy installed certificate */`
instead of a helper function

[Eric Seckler, 2016/11/03 17:01:06]

Done.

+                                         base::Bind(&web::IsOriginSecure));
 }
 
-bool IOSChromeSecurityStateModelClient::UsedPolicyInstalledCertificate() {
+bool IOSSecurityStateTabHelper::UsedPolicyInstalledCertificate() const {
   return false;
 }
 
-bool IOSChromeSecurityStateModelClient::IsOriginSecure(const GURL& url) {
-  return web::IsOriginSecure(url);
-}
+std::unique_ptr<security_state::SecurityStateModel::VisibleSecurityState>
+IOSSecurityStateTabHelper::GetVisibleSecurityState() const {
+  auto state = base::MakeUnique<
+      security_state::SecurityStateModel::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 +56,5 @@ void IOSChromeSecurityStateModelClient::GetVisibleSecurityState(
   state->displayed_mixed_content =
       (ssl.content_status & web::SSLStatus::DISPLAYED_INSECURE_CONTENT) ? true
                                                                         : false;
+  return state;
 }