Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
index d8a2469675e1e5c6fd41b7c174227573f2d1fe11..401c5f3d62e4458265e013d8301d4ab52d7f9872 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
@@ -6,7 +6,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/chrome_security_state_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -120,11 +120,11 @@ bool LocationIconDecoration::OnMousePressed(NSRect frame, NSPoint location) {
     return true;
   Browser* browser = chrome::FindBrowserWithWebContents(tab);
 
-  ChromeSecurityStateModelClient* security_model_client =
-      ChromeSecurityStateModelClient::FromWebContents(tab);
-  DCHECK(security_model_client);
+  ChromeSecurityStateModel* security_model =
+      ChromeSecurityStateModel::FromWebContents(tab);
+  DCHECK(security_model);
   security_state::SecurityStateModel::SecurityInfo security_info;
-  security_model_client->GetSecurityInfo(&security_info);
+  security_model->GetSecurityInfo(&security_info);
 
   chrome::ShowWebsiteSettings(browser, tab, nav_entry->GetVirtualURL(),
                               security_info);