Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc

Index: chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
diff --git a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
index dd72f247e52988197f51642806794d44cba426b3..fa20b257d28148b0e2ff7d242bae673d3765018a 100644
--- a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
@@ -75,9 +75,9 @@ ChromeToolbarModelDelegate::GetSecurityLevel() const {
   // initialization), assume no security style.
   if (!web_contents)
     return security_state::SecurityStateModel::NONE;
-  auto* client = ChromeSecurityStateModelClient::FromWebContents(web_contents);
+  auto* helper = SecurityStateTabHelper::FromWebContents(web_contents);
   security_state::SecurityStateModel::SecurityInfo security_info;
-  client->GetSecurityInfo(&security_info);
+  helper->GetSecurityInfo(&security_info);
   return security_info.security_level;
 }
 
@@ -96,7 +96,7 @@ bool ChromeToolbarModelDelegate::FailsMalwareCheck() const {
   if (!web_contents)
     return false;
   security_state::SecurityStateModel::SecurityInfo security_info;
-  ChromeSecurityStateModelClient::FromWebContents(web_contents)
+  SecurityStateTabHelper::FromWebContents(web_contents)
       ->GetSecurityInfo(&security_info);
   return security_info.fails_malware_check;
 }