Refactor SecurityStateModel/Clients for simplicity and reusability.

components/security_state/core/BUILD.gn

Index: components/security_state/core/BUILD.gn
diff --git a/components/security_state/BUILD.gn b/components/security_state/core/BUILD.gn
similarity index 72%
rename from components/security_state/BUILD.gn
rename to components/security_state/core/BUILD.gn
index 9eab4a3a0aaa8db810059f9efd5c72bc9816adaa..3ce60b7059395e87a8513a554b8cb4c9ed6b24fa 100644
--- a/components/security_state/BUILD.gn
+++ b/components/security_state/core/BUILD.gn
@@ -7,11 +7,10 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-static_library("security_state") {
+static_library("core") {
   sources = [
-    "security_state_model.cc",
-    "security_state_model.h",
-    "security_state_model_client.h",
+    "security_state.cc",
+    "security_state.h",
     "switches.cc",
     "switches.h",
   ]
@@ -25,7 +24,7 @@ static_library("security_state") {
 if (is_android) {
   java_cpp_enum("security_state_enums_java") {
     sources = [
-      "security_state_model.h",
+      "security_state.h",
     ]
   }
 }
@@ -33,11 +32,11 @@ if (is_android) {
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "security_state_model_unittest.cc",
+    "security_state_unittest.cc",
   ]
 
   deps = [
-    ":security_state",
+    ":core",
     "//net:test_support",
     "//testing/gtest",
   ]