Refactor SecurityStateModel/Clients for simplicity and reusability.

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 2e6df2ff648b8ffca58c62ce228a813f1916572f..3c7d371c3650d918988443567b61cccb35a01c2e 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -82,7 +82,6 @@ using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 using content::BrowserThread;
-using security_state::SecurityStateModel;
 
 namespace {
 
@@ -137,28 +136,28 @@ bool ShouldShowPermission(ContentSettingsType type) {
   return true;
 }
 
-void CheckContentStatus(SecurityStateModel::ContentStatus content_status,
+void CheckContentStatus(security_state::ContentStatus content_status,
                         bool* displayed,
                         bool* ran) {
   switch (content_status) {
-    case SecurityStateModel::CONTENT_STATUS_DISPLAYED:
+    case security_state::CONTENT_STATUS_DISPLAYED:
       *displayed = true;
       break;
-    case SecurityStateModel::CONTENT_STATUS_RAN:
+    case security_state::CONTENT_STATUS_RAN:
       *ran = true;
       break;
-    case SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN:
+    case security_state::CONTENT_STATUS_DISPLAYED_AND_RAN:
       *displayed = true;
       *ran = true;
       break;
-    case SecurityStateModel::CONTENT_STATUS_UNKNOWN:
-    case SecurityStateModel::CONTENT_STATUS_NONE:
+    case security_state::CONTENT_STATUS_UNKNOWN:
+    case security_state::CONTENT_STATUS_NONE:
       break;
   }
 }
 
 void CheckForInsecureContent(
-    const SecurityStateModel::SecurityInfo& security_info,
+    const security_state::SecurityInfo& security_info,
     bool* displayed,
     bool* ran) {
   CheckContentStatus(security_info.mixed_content_status, displayed, ran);
@@ -255,7 +254,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)
     : TabSpecificContentSettings::SiteDataObserver(
           tab_specific_content_settings),
       content::WebContentsObserver(web_contents),
@@ -270,7 +269,7 @@ WebsiteSettings::WebsiteSettings(
           ChromeSSLHostStateDelegateFactory::GetForProfile(profile)),
       did_revoke_user_ssl_decisions_(false),
       profile_(profile),
-      security_level_(security_state::SecurityStateModel::NONE) {
+      security_level_(security_state::NONE) {
   Init(url, security_info);
 
   PresentSitePermissions();
@@ -294,26 +293,24 @@ void WebsiteSettings::RecordWebsiteSettingsAction(
   std::string histogram_name;
 
   if (site_url_.SchemeIsCryptographic()) {
-    if (security_level_ == security_state::SecurityStateModel::SECURE ||
-        security_level_ == security_state::SecurityStateModel::EV_SECURE) {
+    if (security_level_ == security_state::SECURE ||
+        security_level_ == security_state::EV_SECURE) {
       UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpsUrl.Valid",
                                 action, WEBSITE_SETTINGS_COUNT);
-    } else if (security_level_ == security_state::SecurityStateModel::NONE) {
+    } else if (security_level_ == security_state::NONE) {
       UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpsUrl.Downgraded",
                                 action, WEBSITE_SETTINGS_COUNT);
-    } else if (security_level_ ==
-               security_state::SecurityStateModel::DANGEROUS) {
+    } else if (security_level_ == security_state::DANGEROUS) {
       UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpsUrl.Dangerous",
                                 action, WEBSITE_SETTINGS_COUNT);
     }
     return;
   }
 
-  if (security_level_ ==
-      security_state::SecurityStateModel::HTTP_SHOW_WARNING) {
+  if (security_level_ == security_state::HTTP_SHOW_WARNING) {
     UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpUrl.Warning",
                               action, WEBSITE_SETTINGS_COUNT);
-  } else if (security_level_ == security_state::SecurityStateModel::DANGEROUS) {
+  } else if (security_level_ == security_state::DANGEROUS) {
     UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpUrl.Dangerous",
                               action, WEBSITE_SETTINGS_COUNT);
   } else {
@@ -411,9 +408,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) {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   // On desktop, internal URLs aren't handled by this class. Instead, a
   // custom and simpler popup is shown.
@@ -460,7 +456,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::SECURE_WITH_POLICY_INSTALLED_CERT) {
+        security_state::SECURE_WITH_POLICY_INSTALLED_CERT) {
       site_identity_status_ = SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT;
       site_identity_details_ = l10n_util::GetStringFUTF16(
           IDS_CERT_POLICY_PROVIDED_CERT_MESSAGE, UTF8ToUTF16(url.host()));
@@ -539,7 +535,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_ +=
@@ -547,7 +543,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_ +=
@@ -555,10 +551,10 @@ 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;
-        case SecurityStateModel::UNKNOWN_SHA1:
+        case security_state::UNKNOWN_SHA1:
           // UNKNOWN_SHA1 should only appear when certificate info has not been
           // initialized, in which case this if-statement should not be running
           // because there is no other cert info.
@@ -614,7 +610,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,