Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/BUILD.gn

Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 7010a3d9f3a763aa6045fb65fdd7300fae464920..f1b32511cdd62f11eea158cab9895135fd121351 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1128,14 +1128,14 @@ split_static_library("browser") {
     "ssl/cert_report_helper.h",
     "ssl/chrome_expect_ct_reporter.cc",
     "ssl/chrome_expect_ct_reporter.h",
-    "ssl/chrome_security_state_model_client.cc",
-    "ssl/chrome_security_state_model_client.h",
     "ssl/chrome_ssl_host_state_delegate.cc",
     "ssl/chrome_ssl_host_state_delegate.h",
     "ssl/chrome_ssl_host_state_delegate_factory.cc",
     "ssl/chrome_ssl_host_state_delegate_factory.h",
     "ssl/common_name_mismatch_handler.cc",
     "ssl/common_name_mismatch_handler.h",
+    "ssl/security_state_tab_helper.cc",
+    "ssl/security_state_tab_helper.h",
     "ssl/ssl_blocking_page.cc",
     "ssl/ssl_blocking_page.h",
     "ssl/ssl_cert_reporter.h",
@@ -1377,7 +1377,8 @@ split_static_library("browser") {
     "//components/search_engines",
     "//components/search_provider_logos",
     "//components/security_interstitials/core",
-    "//components/security_state",
+    "//components/security_state/content",
+    "//components/security_state/core",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/ssl_config",