Refactor SecurityStateModel/Clients for simplicity and reusability.

components/BUILD.gn

Index: components/BUILD.gn
diff --git a/components/BUILD.gn b/components/BUILD.gn
index debccc773ab08d19fc6c236f9e93a6c986e9e9ea..8ba14991e3cd56758ba1e4f6386a86a5376610df 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
@@ -117,7 +118,7 @@ test("components_unittests") {
     "//components/search:unit_tests",
     "//components/search_engines:unit_tests",
     "//components/search_provider_logos:unit_tests",
-    "//components/security_state:unit_tests",
+    "//components/security_state/core:unit_tests",
     "//components/sessions:unit_tests",
     "//components/signin/core/browser:unit_tests",
     "//components/ssl_config:unit_tests",
@@ -191,6 +192,7 @@ test("components_unittests") {
       "//components/precache/content:unit_tests",
       "//components/safe_browsing_db:unit_tests",
       "//components/safe_json:unit_tests",
+      "//components/security_state/content:unit_tests",
       "//components/spellcheck/browser:unit_tests",
       "//components/spellcheck/renderer:unit_tests",
       "//components/subresource_filter/content/browser:unit_tests",
@@ -316,6 +318,12 @@ repack("components_tests_pak") {
     "//components/resources",
     "//components/strings",
   ]
+
+  if (is_chrome_branded) {
+    sources += [ "${root_gen_dir}/components/strings/components_google_chrome_strings_en-US.pak" ]
+  } else {
+    sources += [ "${root_gen_dir}/components/strings/components_chromium_strings_en-US.pak" ]
+  }
 }
 
 if (is_android) {
@@ -380,6 +388,7 @@ if (!is_ios) {
       "dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc",
       "dom_distiller/content/browser/test/dom_distiller_js_browsertest.cc",
       "password_manager/content/renderer/credential_manager_client_browsertest.cc",
+      "security_state/content/content_utils_browsertest.cc",
       "tracing/child/child_trace_message_filter_browsertest.cc",
     ]
 
@@ -403,8 +412,11 @@ if (!is_ios) {
       "//components/dom_distiller/core:test_support",
       "//components/password_manager/content/browser",
       "//components/password_manager/content/renderer",
+      "//components/security_state/content",
+      "//components/security_state/core",
       "//components/strings",
       "//components/tracing",
+      "//content/public/browser",
       "//content/shell:content_shell_lib",
       "//content/test:browsertest_support",
       "//content/test:test_support",
@@ -416,6 +428,7 @@ if (!is_ios) {
       "//testing/gmock",
       "//testing/gtest",
       "//ui/base",
+      "//url",
     ]
 
     data_deps = [