Pull SecurityStateModel out into a component

components/security_state/security_state_model.cc

 // Copyright 2015 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.
 
-#include "chrome/browser/ssl/security_state_model.h"
+#include "components/security_state/security_state_model.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
-#include "chrome/browser/ssl/security_state_model_client.h"
-#include "chrome/common/chrome_switches.h"
+#include "components/security_state/security_state_model_client.h"
+#include "components/security_state/switches.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 
+namespace security_state {
+
 namespace {
 
 SecurityStateModel::SecurityLevel GetSecurityLevelForNonSecureFieldTrial() {
-  // TODO(estark): componentize switches::kMarkNonSecureAs.
-  // https://crbug.com/515071
   std::string choice =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kMarkNonSecureAs);
   std::string group = base::FieldTrialList::FindFullName("MarkNonSecureAs");
 
   // Do not change this enum. It is used in the histogram.
   enum MarkNonSecureStatus { NEUTRAL, DUBIOUS, NON_SECURE, LAST_STATUS };
   const char kEnumeration[] = "MarkNonSecureAs";
 
   SecurityStateModel::SecurityLevel level = SecurityStateModel::NONE;
@@ skipping 239 matching lines @@
     const SecurityStateModel::VisibleSecurityState& other) const {
   return (url == other.url &&
           initial_security_level == other.initial_security_level &&
           cert_id == other.cert_id && cert_status == other.cert_status &&
           connection_status == other.connection_status &&
           security_bits == other.security_bits &&
           sct_verify_statuses == other.sct_verify_statuses &&
           displayed_mixed_content == other.displayed_mixed_content &&
           ran_mixed_content == other.ran_mixed_content);
 }
+
+}  // namespace security_state