Refactor SecurityStateModel/Clients for simplicity and reusability.

components/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # 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("//printing/features/features.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
@@ skipping 98 matching lines @@
     "//components/physical_web/data_source:unit_tests",
     "//components/precache/core:unit_tests",
     "//components/prefs:unit_tests",
     "//components/previews/core:unit_tests",
     "//components/proxy_config:unit_tests",
     "//components/query_parser:unit_tests",
     "//components/rappor:unit_tests",
     "//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",
     "//components/ssl_errors:unit_tests",
     "//components/subresource_filter/core/browser:unit_tests",
     "//components/subresource_filter/core/common:unit_tests",
     "//components/suggestions:unit_tests",
     "//components/supervised_user_error_page:unit_tests",
     "//components/sync:unit_tests",
     "//components/sync_bookmarks:unit_tests",
@@ skipping 53 matching lines @@
       "//components/keyed_service/content:unit_tests",
       "//components/link_header_util:unit_tests",
       "//components/navigation_interception:unit_tests",
       "//components/network_hints/renderer:unit_tests",
       "//components/packed_ct_ev_whitelist:unit_tests",
       "//components/password_manager/content/browser:unit_tests",
       "//components/power:unit_tests",
       "//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",
       "//components/subresource_filter/content/renderer:unit_tests",
       "//components/tracing:unit_tests",
       "//components/visitedlink/test:unit_tests",
       "//components/wallpaper:unit_tests",
       "//components/web_cache/browser:unit_tests",
       "//components/webcrypto:unit_tests",
       "//components/zoom:unit_tests",
@@ skipping 105 matching lines @@
   sources = [
     "$root_gen_dir/components/components_resources.pak",
     "$root_gen_dir/components/strings/components_strings_en-US.pak",
   ]
 
   output = "$root_out_dir/components_tests_resources.pak"
   deps = [
     "//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) {
   android_assets("components_browsertests_assets") {
     testonly = true
     sources = [
       "$root_out_dir/components_tests_resources.pak",
       "$root_out_dir/content_shell.pak",
     ]
     deps = [
@@ skipping 44 matching lines @@
   test("components_browsertests") {
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
     sources = [
       "autofill/content/browser/risk/fingerprint_browsertest.cc",
       "autofill/content/renderer/password_form_conversion_utils_browsertest.cc",
       "dom_distiller/content/browser/distillable_page_utils_browsertest.cc",
       "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",
     ]
 
     data = [
       "$root_out_dir/components_tests_resources.pak",
       "$root_out_dir/content_shell.pak",
       "test/data/",
       "dom_distiller/core/javascript/",
       "//third_party/dom_distiller_js/dist/test/data/",
     ]
 
     deps = [
       "//base",
       "//base/test:test_support",
       "//components/autofill/content/browser",
       "//components/autofill/content/renderer",
       "//components/autofill/core/browser",
       "//components/content_settings/core/common",
       "//components/dom_distiller/content/browser",
       "//components/dom_distiller/core",
       "//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",
       "//device/bluetooth",
       "//device/geolocation",
       "//ipc:test_support",
       "//net:test_support",
       "//printing/features",
       "//services/service_manager/public/cpp",
       "//testing/gmock",
       "//testing/gtest",
       "//ui/base",
+      "//url",
     ]
 
     data_deps = [
       ":components_tests_pak",
       "//third_party/mesa:osmesa",
     ]
 
     if (is_mac) {
       data_deps += [ "//content/shell:content_shell" ]
       data += [ "$root_out_dir/Content Shell.app/" ]
@@ skipping 53 matching lines @@
       "//testing/perf",
       "//url",
     ]
 
     if (!is_ios) {
       sources += [ "discardable_memory/common/discardable_shared_memory_heap_perftest.cc" ]
       deps += [ "//components/discardable_memory/common" ]
     }
   }
 }