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 198c46060746be569e7272088c27037f72ff1847..4d03614a822a3c9034c82bd0b77c3550c5941eb4 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")
@@ -119,7 +120,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",
@@ -189,6 +190,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",
@@ -314,6 +316,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) {