Remove obsolete SHA-1 UX elements

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 024e5ae67d069f4ae1e6533867ffed5bcf39029e..89119f6ab1ee626ea8ed53aa32ac583b0ee4154d 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -593,7 +593,7 @@ TEST_F(WebsiteSettingsTest, HTTPSPolicyCertConnection) {
   EXPECT_EQ(base::string16(), website_settings()->organization_name());
 }
 
-TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) {
+TEST_F(WebsiteSettingsTest, HTTPSSHA1) {
   security_info_.security_level = security_state::NONE;
   security_info_.scheme_is_cryptographic = true;
   security_info_.certificate = cert();
@@ -603,48 +603,21 @@ TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) {
   status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
   status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
   security_info_.connection_status = status;
-  security_info_.sha1_deprecation_status =
-      security_state::DEPRECATED_SHA1_MINOR;
+  security_info_.sha1_in_chain = true;
 
   SetDefaultUIExpectations(mock_ui());
 
   EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED,
             website_settings()->site_connection_status());
-  EXPECT_EQ(WebsiteSettings::
-                SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR,
-            website_settings()->site_identity_status());
+  EXPECT_EQ(
+      WebsiteSettings::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM,
+      website_settings()->site_identity_status());
   EXPECT_EQ(base::string16(), website_settings()->organization_name());
   EXPECT_EQ(IDR_PAGEINFO_WARNING_MINOR,
             WebsiteSettingsUI::GetIdentityIconID(
                 website_settings()->site_identity_status()));
 }
 
-TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) {
-  security_info_.security_level = security_state::NONE;
-  security_info_.scheme_is_cryptographic = true;
-  security_info_.certificate = cert();
-  security_info_.cert_status = 0;
-  security_info_.security_bits = 81;  // No error if > 80.
-  int status = 0;
-  status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
-  status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
-  security_info_.connection_status = status;
-  security_info_.sha1_deprecation_status =
-      security_state::DEPRECATED_SHA1_MAJOR;
-
-  SetDefaultUIExpectations(mock_ui());
-
-  EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED,
-            website_settings()->site_connection_status());
-  EXPECT_EQ(WebsiteSettings::
-                SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR,
-            website_settings()->site_identity_status());
-  EXPECT_EQ(base::string16(), website_settings()->organization_name());
-  EXPECT_EQ(IDR_PAGEINFO_BAD,
-            WebsiteSettingsUI::GetIdentityIconID(
-                website_settings()->site_identity_status()));
-}
-
 #if !defined(OS_ANDROID)
 TEST_F(WebsiteSettingsTest, NoInfoBar) {
   SetDefaultUIExpectations(mock_ui());