Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 682a35a94d06877a064939484717405f351ee17c..d748e85f2aee2c5a8d7c97f8ff7d5bdad22d70b8 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1707,8 +1707,8 @@ test("browser_tests") {
       "../browser/ssl/cert_verifier_browser_test.h",
       "../browser/ssl/certificate_reporting_test_utils.cc",
       "../browser/ssl/certificate_reporting_test_utils.h",
-      "../browser/ssl/chrome_security_state_model_client_browser_tests.cc",
       "../browser/ssl/chrome_ssl_host_state_delegate_test.cc",
+      "../browser/ssl/security_state_tab_helper_browser_tests.cc",
       "../browser/ssl/ssl_browser_tests.cc",
       "../browser/ssl/ssl_client_certificate_selector_test.cc",
       "../browser/ssl/ssl_client_certificate_selector_test.h",
@@ -3296,7 +3296,7 @@ test("unit_tests") {
     "../browser/signin/signin_tracker_unittest.cc",
     "../browser/signin/test_signin_client_builder.cc",
     "../browser/ssl/chrome_expect_ct_reporter_unittest.cc",
-    "../browser/ssl/chrome_security_state_model_client_unittest.cc",
+    "../browser/ssl/security_state_tab_helper_unittest.cc",
     "../browser/ssl/ssl_error_handler_unittest.cc",
     "../browser/status_icons/status_icon_menu_model_unittest.cc",
     "../browser/status_icons/status_icon_unittest.cc",