Refactor SecurityStateModel/Clients for simplicity and reusability.

components/security_state/core/security_state_model_unittest.cc

Index: components/security_state/core/security_state_model_unittest.cc
diff --git a/components/security_state/security_state_model_unittest.cc b/components/security_state/core/security_state_model_unittest.cc
similarity index 98%
rename from components/security_state/security_state_model_unittest.cc
rename to components/security_state/core/security_state_model_unittest.cc
index 59d668b78374a541c1c39f7627663395b7ce975f..41336b02c3da721d095eebe301656fad3e653f42 100644
--- a/components/security_state/security_state_model_unittest.cc
+++ b/components/security_state/core/security_state_model_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state_model.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
-#include "components/security_state/security_state_model_client.h"
-#include "components/security_state/switches.h"
+#include "components/security_state/core/security_state_model_client.h"
+#include "components/security_state/core/switches.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_connection_status_flags.h"