Remove obsolete SHA-1 UX elements

components/security_state/content/content_utils.cc

Index: components/security_state/content/content_utils.cc
diff --git a/components/security_state/content/content_utils.cc b/components/security_state/content/content_utils.cc
index ec7b804210ea536175b5e8394df1a2ab80a619a9..5eb8f46d3b7affb8bc4d945b088be313285f808a 100644
--- a/components/security_state/content/content_utils.cc
+++ b/components/security_state/content/content_utils.cc
@@ -231,18 +231,11 @@ blink::WebSecurityStyle GetSecurityStyle(
   }
 
   if (security_info.sha1_deprecation_status ==
-      security_state::DEPRECATED_SHA1_MAJOR) {
+      security_state::DEPRECATED_SHA1) {
     security_style_explanations->broken_explanations.push_back(

[estark, 2017/01/05 16:18:42]

I might be getting myself confused, but I think this should be in
|unauthenticated_explanations| (that field is badly named... it should be
|neutral_explanations| or something) and should only be included if there is no
cert error.

Usually SHA1 will be treated as a cert error and I don't know if we need a
special explanation for it; it will be covered by the generic certificate error
explanation on line 283. (Or maybe we want a special SHA1 explanation on line
283 if SHA1 is the only certificate error.)

This path here should explain the case where the security level is neutral when
the policy is set, which is why I think it should be in
|unauthenticated_explanations| and only when SHA1 isn't being treated as a cert
error.

         content::SecurityStyleExplanation(
-            l10n_util::GetStringUTF8(IDS_MAJOR_SHA1),
-            l10n_util::GetStringUTF8(IDS_MAJOR_SHA1_DESCRIPTION),
-            !!security_info.certificate));
-  } else if (security_info.sha1_deprecation_status ==
-             security_state::DEPRECATED_SHA1_MINOR) {
-    security_style_explanations->unauthenticated_explanations.push_back(
-        content::SecurityStyleExplanation(
-            l10n_util::GetStringUTF8(IDS_MINOR_SHA1),
-            l10n_util::GetStringUTF8(IDS_MINOR_SHA1_DESCRIPTION),
+            l10n_util::GetStringUTF8(IDS_SHA1),
+            l10n_util::GetStringUTF8(IDS_SHA1_DESCRIPTION),
             !!security_info.certificate));
   }