Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
@@ skipping 1103 matching lines @@
     "speech/tts_message_filter.h",
     "speech/tts_platform.cc",
     "speech/tts_platform.h",
     "speech/tts_win.cc",
     "ssl/bad_clock_blocking_page.cc",
     "ssl/bad_clock_blocking_page.h",
     "ssl/cert_report_helper.cc",
     "ssl/cert_report_helper.h",
     "ssl/chrome_expect_ct_reporter.cc",
     "ssl/chrome_expect_ct_reporter.h",
-    "ssl/chrome_security_state_model_client.cc",
-    "ssl/chrome_security_state_model_client.h",
+    "ssl/chrome_security_state_model.cc",
     "ssl/chrome_ssl_host_state_delegate.cc",
     "ssl/chrome_ssl_host_state_delegate.h",
     "ssl/chrome_ssl_host_state_delegate_factory.cc",
     "ssl/chrome_ssl_host_state_delegate_factory.h",
     "ssl/common_name_mismatch_handler.cc",
     "ssl/common_name_mismatch_handler.h",
     "ssl/ssl_blocking_page.cc",
     "ssl/ssl_blocking_page.h",
     "ssl/ssl_cert_reporter.h",
     "ssl/ssl_client_certificate_selector.h",
@@ skipping 226 matching lines @@
     "//components/rappor",
     "//components/rappor:rappor_recorder",
     "//components/renderer_context_menu",
     "//components/resources",
     "//components/safe_browsing_db",
     "//components/safe_json",
     "//components/search",
     "//components/search_engines",
     "//components/search_provider_logos",
     "//components/security_interstitials/core",
-    "//components/security_state",
+    "//components/security_state/content",
+    "//components/security_state/core",
     "//components/sessions",
     "//components/signin/core/browser",
     "//components/ssl_config",
     "//components/ssl_errors",
     "//components/startup_metric_utils/browser:host",
     "//components/startup_metric_utils/browser:lib",
     "//components/storage_monitor",
     "//components/strings",
     "//components/subresource_filter/content/browser",
     "//components/subresource_filter/core/browser",
@@ skipping 2947 matching lines @@
   # linking all of the test support.
   static_library("pepper_cdm_test_constants") {
     testonly = true
     visibility = [ "//chrome/*" ]
     sources = [
       "media/pepper_cdm_test_constants.cc",
       "media/pepper_cdm_test_constants.h",
     ]
   }
 }