Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 4c02948d4ae9543a60c89f9fa0b97db30fb0ee48..62b12a7d644e876216de8c6522a149adf50fcb9d 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -167,7 +167,8 @@
 #include "components/history/core/browser/top_sites.h"
 #include "components/prefs/pref_service.h"
 #include "components/search/search.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/content/web_contents_security_state_model.h"
+#include "components/security_state/core/security_state_model.h"
 #include "components/sessions/core/session_types.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
@@ -1284,8 +1285,8 @@ blink::WebSecurityStyle Browser::GetSecurityStyle(
   DCHECK(model_client);
   security_state::SecurityStateModel::SecurityInfo security_info;
   model_client->GetSecurityInfo(&security_info);
-  return model_client->GetSecurityStyle(security_info,
-                                        security_style_explanations);
+  return security_state::WebContentsSecurityStateModel::GetSecurityStyle(
+      security_info, security_style_explanations);
 }
 
 void Browser::ShowCertificateViewerInDevTools(