| Index: components/security_state/core/security_state.h
|
| diff --git a/components/security_state/core/security_state.h b/components/security_state/core/security_state.h
|
| index 62b1806a3c178c8315c6871ef19661334c6d25c9..122d6e398c725f54814e697979e2043f950ab7e2 100644
|
| --- a/components/security_state/core/security_state.h
|
| +++ b/components/security_state/core/security_state.h
|
| @@ -72,16 +72,10 @@ enum SecurityLevel {
|
| // connection.
|
| enum SHA1DeprecationStatus {
|
| UNKNOWN_SHA1,
|
| - // No SHA1 deprecation policy applies.
|
| + // The connection's certificate chain did not contain a SHA1 signature.
|
| 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 connection's certificate chain contained a SHA1 signature.
|
| + DEPRECATED_SHA1
|
| };
|
|
|
| // The ContentStatus enum is used to describe content on the page that
|
| @@ -198,10 +192,6 @@ struct VisibleSecurityState {
|
| 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
|
|
|