Remove obsolete SHA-1 UX elements

components/security_state/core/security_state_unittest.cc

 // 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.
 
 #include "components/security_state/core/security_state.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 96 matching lines @@
   int connection_status_;
   net::CertStatus cert_status_;
   bool displayed_mixed_content_;
   bool ran_mixed_content_;
   MaliciousContentStatus malicious_content_status_;
   bool displayed_password_field_on_http_;
   bool displayed_credit_card_field_on_http_;
 };
 
 }  // namespace
 

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

Could you add a test for the cert-error SHA1 case, testing that if cert_status
includes WEAK_SIGNATURE_ALGORITHM (the error status) *and*
SHA1_SIGNATURE_PRESENT, the security level is DANGEROUS?

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

Done.

 // Tests that SHA1-signed certificates expiring in 2016 downgrade the

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

the "expiring in 2016" bit should be removed, yeah?

Also maybe this should clarify that this is the non-error SHA1 case, something
like:
"Tests that SHA1-signed certificates, when not treated as a certificate error
such as when allowed by policy, downgrade the security state of the page to
NONE."

And ditto on the tests below.

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

Done.

 // security state of the page.
 TEST(SecurityStateTest, SHA1Warning) {
   TestSecurityStateHelper helper;
   SecurityInfo security_info;
   helper.GetSecurityInfo(&security_info);
-  EXPECT_EQ(DEPRECATED_SHA1_MINOR, security_info.sha1_deprecation_status);
-  EXPECT_EQ(DANGEROUS, security_info.security_level);
+  EXPECT_EQ(true, security_info.sha1_in_chain);

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

nit: EXPECT_TRUE

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

Done.

+  EXPECT_EQ(NONE, security_info.security_level);
 }
 
 // Tests that SHA1 warnings don't interfere with the handling of mixed
 // content.
 TEST(SecurityStateTest, SHA1WarningMixedContent) {
   TestSecurityStateHelper helper;
   helper.SetDisplayedMixedContent(true);
   SecurityInfo security_info1;
   helper.GetSecurityInfo(&security_info1);
-  EXPECT_EQ(DEPRECATED_SHA1_MINOR, security_info1.sha1_deprecation_status);
+  EXPECT_EQ(true, security_info1.sha1_in_chain);

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

nit: EXPECT_TRUE

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

Done.

   EXPECT_EQ(CONTENT_STATUS_DISPLAYED, security_info1.mixed_content_status);
-  EXPECT_EQ(DANGEROUS, security_info1.security_level);
+  EXPECT_EQ(NONE, security_info1.security_level);
 
   helper.SetDisplayedMixedContent(false);
   helper.SetRanMixedContent(true);
   SecurityInfo security_info2;
   helper.GetSecurityInfo(&security_info2);
-  EXPECT_EQ(DEPRECATED_SHA1_MINOR, security_info2.sha1_deprecation_status);
+  EXPECT_EQ(true, security_info2.sha1_in_chain);

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

nit: EXPECT_TRUE

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

Done.

   EXPECT_EQ(CONTENT_STATUS_RAN, security_info2.mixed_content_status);
   EXPECT_EQ(DANGEROUS, security_info2.security_level);
 }
 
 // Tests that SHA1 warnings don't interfere with the handling of major
 // cert errors.
 TEST(SecurityStateTest, SHA1WarningBrokenHTTPS) {
   TestSecurityStateHelper helper;
   helper.AddCertStatus(net::CERT_STATUS_DATE_INVALID);
   SecurityInfo security_info;
   helper.GetSecurityInfo(&security_info);
-  EXPECT_EQ(DEPRECATED_SHA1_MINOR, security_info.sha1_deprecation_status);
+  EXPECT_EQ(true, security_info.sha1_in_chain);

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

nit: EXPECT_TRUE

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

Done.

   EXPECT_EQ(DANGEROUS, security_info.security_level);
 }
 
 // Tests that |security_info.is_secure_protocol_and_ciphersuite| is
 // computed correctly.
 TEST(SecurityStateTest, SecureProtocolAndCiphersuite) {
   TestSecurityStateHelper helper;
   // TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 from
   // http://www.iana.org/assignments/tls-parameters/tls-parameters.xml#tls-parameters-4
   const uint16_t ciphersuite = 0xc02f;
@@ skipping 145 matching lines @@
   helper.GetSecurityInfo(&security_info);
   histograms.ExpectUniqueSample(kHistogramName, 2 /* HTTP_SHOW_WARNING */, 1);
 
   // Ensure histogram recorded correctly even without a password input.
   helper.set_displayed_password_field_on_http(false);
   helper.GetSecurityInfo(&security_info);
   histograms.ExpectUniqueSample(kHistogramName, 2 /* HTTP_SHOW_WARNING */, 2);
 }
 
 }  // namespace security_state