Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

chrome/browser/ui/website_settings/website_settings_unittest.cc

Index: chrome/browser/ui/website_settings/website_settings_unittest.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index 6c38587b6a97969f704ee6b1008f699347480968..baf675afe2669801c3521bca2e7cba51f219affa 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -385,7 +385,7 @@ TEST_F(WebsiteSettingsTest, HTTPSPassiveMixedContent) {
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   security_info_.mixed_content_status =
-      SecurityStateModel::DISPLAYED_MIXED_CONTENT;
+      SecurityStateModel::CONTENT_STATUS_DISPLAYED;
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
   status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
@@ -411,7 +411,7 @@ TEST_F(WebsiteSettingsTest, HTTPSActiveMixedContent) {
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   security_info_.mixed_content_status =
-      SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT;
+      SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN;
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
   status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
@@ -445,7 +445,7 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {
   security_info_.cert_status = net::CERT_STATUS_IS_EV;
   security_info_.security_bits = 81;  // No error if > 80.
   security_info_.mixed_content_status =
-      SecurityStateModel::DISPLAYED_MIXED_CONTENT;
+      SecurityStateModel::CONTENT_STATUS_DISPLAYED;
   int status = 0;
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
   status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);