Remove obsolete SHA-1 UX elements

components/security_state/core/security_state.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SECURITY_STATE_SECURITY_STATE_H_
 #define COMPONENTS_SECURITY_STATE_SECURITY_STATE_H_
 
 #include <stdint.h>
 #include <memory>
 
@@ skipping 50 matching lines @@
   // HTTPS, but the certificate verification chain is anchored on a
   // certificate that was installed by the system administrator.
   SECURE_WITH_POLICY_INSTALLED_CERT,
 
   // Attempted HTTPS and failed, page not authenticated, HTTPS with
   // insecure active content on the page, malware, phishing, or any other
   // serious security issue that could be dangerous.
   DANGEROUS,
 };
 
-// Describes how the SHA1 deprecation policy applies to an HTTPS
-// connection.
-enum SHA1DeprecationStatus {
-  UNKNOWN_SHA1,
-  // No SHA1 deprecation policy applies.
-  NO_DEPRECATED_SHA1,
-  // The connection used a certificate with a SHA1 signature in the
-  // chain, and policy says that the connection should be treated with a
-  // warning.
-  DEPRECATED_SHA1_MINOR,
-  // The connection used a certificate with a SHA1 signature in the
-  // chain, and policy says that the connection should be treated as
-  // broken HTTPS.
-  DEPRECATED_SHA1_MAJOR,
-};
-
 // The ContentStatus enum is used to describe content on the page that
 // has significantly different security properties than the main page
 // load. Content can be passive content that is displayed (such as
 // images) or active content that is run (such as scripts or iframes).
 enum ContentStatus {
   CONTENT_STATUS_UNKNOWN,
   CONTENT_STATUS_NONE,
   CONTENT_STATUS_DISPLAYED,
   CONTENT_STATUS_RAN,
   CONTENT_STATUS_DISPLAYED_AND_RAN,
@@ skipping 13 matching lines @@
 // SecurityLevel (which
 // is a single value describing the overall security state) along with
 // information that a consumer might want to display in UI to explain or
 // elaborate on the SecurityLevel.
 struct SecurityInfo {
   SecurityInfo();
   ~SecurityInfo();
   SecurityLevel security_level;
   // Describes the nature of the page's malicious content, if any.
   MaliciousContentStatus malicious_content_status;
-  SHA1DeprecationStatus sha1_deprecation_status;
+  // True if a SHA1 signature was observed anywhere in the certificate chain

[estark, 2017/01/08 16:39:58]

nit: period at the end

[elawrence, 2017/01/09 18:13:11]

Done.

+  bool sha1_in_chain;
   // |mixed_content_status| describes the presence of content that was
   // loaded over a nonsecure (HTTP) connection.
   ContentStatus mixed_content_status;
   // |content_with_cert_errors_status| describes the presence of
   // content that was loaded over an HTTPS connection with
   // certificate errors.
   ContentStatus content_with_cert_errors_status;
   // The verification statuses of the signed certificate timestamps
   // for the connection.
   std::vector<net::ct::SCTVerifyStatus> sct_verify_statuses;
@@ skipping 60 matching lines @@
   // True if the page displayed passive subresources with certificate errors.
   bool displayed_content_with_cert_errors;
   // True if the page ran active subresources with certificate errors.
   bool ran_content_with_cert_errors;
   // True if PKP was bypassed due to a local trust anchor.
   bool pkp_bypassed;
   // True if the page was an HTTP page that displayed a password field.
   bool displayed_password_field_on_http;
   // True if the page was an HTTP page that displayed a credit card field.
   bool displayed_credit_card_field_on_http;
-  // True if Enterprise Policy configured to display as neutral all SHA-1 chains
-  // to a local trust anchor.
-  // TODO(elawrence): remove this in M57, https://crbug.com/676826
-  bool display_sha1_from_local_anchors_as_neutral;
 };
 
 // These security levels describe the treatment given to pages that
 // display and run mixed content. They are used to coordinate the
 // treatment of mixed content with other security UI elements.
 constexpr SecurityLevel kDisplayedInsecureContentLevel = NONE;
 constexpr SecurityLevel kRanInsecureContentLevel = DANGEROUS;
 
 // Returns true if the given |url|'s origin should be considered secure.
 using IsOriginSecureCallback = base::Callback<bool(const GURL& url)>;
@@ skipping 11 matching lines @@
     SecurityInfo* result);
 
 // Returns true if an experimental form warning UI about HTTP passwords
 // and credit cards is enabled. This warning UI can be enabled with the
 // |kHttpFormWarningFeature| feature.
 bool IsHttpWarningInFormEnabled();
 
 }  // namespace security_state
 
 #endif  // COMPONENTS_SECURITY_STATE_SECURITY_STATE_H_