Componentize SecurityStateModel

chrome/browser/ui/website_settings/website_settings.cc

Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index a82135ae415194275bef9dde9d413e7b979441ea..3d6192b20a00cc4de7c2037144f44802cbae775f 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -164,7 +164,7 @@ WebsiteSettings::WebsiteSettings(
     TabSpecificContentSettings* tab_specific_content_settings,
     content::WebContents* web_contents,
     const GURL& url,
-    const SecurityStateModel::SecurityInfo& security_info,
+    const security_state::SecurityInfo& security_info,
     content::CertStore* cert_store)
     : TabSpecificContentSettings::SiteDataObserver(
           tab_specific_content_settings),
@@ -309,9 +309,8 @@ void WebsiteSettings::OnRevokeSSLErrorBypassButtonPressed() {
   did_revoke_user_ssl_decisions_ = true;
 }
 
-void WebsiteSettings::Init(
-    const GURL& url,
-    const SecurityStateModel::SecurityInfo& security_info) {
+void WebsiteSettings::Init(const GURL& url,
+                           const security_state::SecurityInfo& security_info) {
   bool isChromeUINativeScheme = false;
 #if defined(OS_ANDROID)
   isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);
@@ -349,7 +348,7 @@ void WebsiteSettings::Init(
        net::IsCertStatusMinorError(security_info.cert_status))) {
     // There are no major errors. Check for minor errors.
     if (security_info.security_level ==
-        SecurityStateModel::SECURITY_POLICY_WARNING) {
+        security_state::SECURITY_POLICY_WARNING) {
       site_identity_status_ = SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT;
       site_identity_details_ = l10n_util::GetStringFUTF16(
           IDS_CERT_POLICY_PROVIDED_CERT_MESSAGE, UTF8ToUTF16(url.host()));
@@ -425,7 +424,7 @@ void WebsiteSettings::Init(
             issuer_name));
       }
       switch (security_info.sha1_deprecation_status) {
-        case SecurityStateModel::DEPRECATED_SHA1_MINOR:
+        case security_state::DEPRECATED_SHA1_MINOR:
           site_identity_status_ =
               SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR;
           site_identity_details_ +=
@@ -433,7 +432,7 @@ void WebsiteSettings::Init(
               l10n_util::GetStringUTF16(
                   IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MINOR);
           break;
-        case SecurityStateModel::DEPRECATED_SHA1_MAJOR:
+        case security_state::DEPRECATED_SHA1_MAJOR:
           site_identity_status_ =
               SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR;
           site_identity_details_ +=
@@ -441,7 +440,7 @@ void WebsiteSettings::Init(
               l10n_util::GetStringUTF16(
                   IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR);
           break;
-        case SecurityStateModel::NO_DEPRECATED_SHA1:
+        case security_state::NO_DEPRECATED_SHA1:
           // Nothing to do.
           break;
       }
@@ -495,7 +494,7 @@ void WebsiteSettings::Init(
     // Security strength is unknown.  Say nothing.
     site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
   } else if (security_info.security_bits == 0) {
-    DCHECK_NE(security_info.security_level, SecurityStateModel::NONE);
+    DCHECK_NE(security_info.security_level, security_state::NONE);
     site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
     site_connection_details_.assign(l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
@@ -514,12 +513,12 @@ void WebsiteSettings::Init(
     }
 
     if (security_info.mixed_content_status !=
-        SecurityStateModel::NO_MIXED_CONTENT) {
+        security_state::NO_MIXED_CONTENT) {
       bool ran_insecure_content =
           (security_info.mixed_content_status ==
-               SecurityStateModel::RAN_MIXED_CONTENT ||
+               security_state::RAN_MIXED_CONTENT ||
            security_info.mixed_content_status ==
-               SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT);
+               security_state::RAN_AND_DISPLAYED_MIXED_CONTENT);
       site_connection_status_ = ran_insecure_content
                                     ? SITE_CONNECTION_STATUS_MIXED_SCRIPT
                                     : SITE_CONNECTION_STATUS_MIXED_CONTENT;