Rename SecurityStyleExplanations and WebSecurityStyle fields

components/security_state/content/content_utils_unittest.cc

 // Copyright 2016 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/content/content_utils.h"
 
 #include "base/command_line.h"
 #include "base/test/histogram_tester.h"
 #include "components/security_state/core/security_state.h"
 #include "components/security_state/core/switches.h"
@@ skipping 187 matching lines @@
         explanations.secure_explanations, "Secure Connection", &explanation));
     EXPECT_EQ(
         "The connection to this site is encrypted and authenticated using a "
         "strong protocol (TLS 1.3), a strong key exchange (X25519), and a "
         "strong cipher (AES_128_GCM).",
         explanation.description);
   }
 }
 
 // Tests that a security level of HTTP_SHOW_WARNING produces
-// blink::WebSecurityStyleUnauthenticated and an explanation if appropriate.
+// blink::WebSecurityStyleNeutral and an explanation if appropriate.
 TEST(SecurityStateContentUtilsTest, HTTPWarning) {
   security_state::SecurityInfo security_info;
   content::SecurityStyleExplanations explanations;
   security_info.security_level = security_state::HTTP_SHOW_WARNING;
   blink::WebSecurityStyle security_style =
       GetSecurityStyle(security_info, &explanations);
-  EXPECT_EQ(blink::WebSecurityStyleUnauthenticated, security_style);
+  EXPECT_EQ(blink::WebSecurityStyleNeutral, security_style);
   // Verify no explanation was shown, because Form Not Secure was not triggered.
-  EXPECT_EQ(0u, explanations.unauthenticated_explanations.size());
+  EXPECT_EQ(0u, explanations.neutral_explanations.size());
 
-  explanations.unauthenticated_explanations.clear();
+  explanations.neutral_explanations.clear();
   security_info.displayed_credit_card_field_on_http = true;
   security_style = GetSecurityStyle(security_info, &explanations);
-  EXPECT_EQ(blink::WebSecurityStyleUnauthenticated, security_style);
+  EXPECT_EQ(blink::WebSecurityStyleNeutral, security_style);
   // Verify one explanation was shown, because Form Not Secure was triggered.
-  EXPECT_EQ(1u, explanations.unauthenticated_explanations.size());
+  EXPECT_EQ(1u, explanations.neutral_explanations.size());
 
   // Check that when both password and credit card fields get displayed, only
   // one explanation is added.
-  explanations.unauthenticated_explanations.clear();
+  explanations.neutral_explanations.clear();
   security_info.displayed_credit_card_field_on_http = true;
   security_info.displayed_password_field_on_http = true;
   security_style = GetSecurityStyle(security_info, &explanations);
-  EXPECT_EQ(blink::WebSecurityStyleUnauthenticated, security_style);
+  EXPECT_EQ(blink::WebSecurityStyleNeutral, security_style);
   // Verify only one explanation was shown when Form Not Secure is triggered.
-  EXPECT_EQ(1u, explanations.unauthenticated_explanations.size());
+  EXPECT_EQ(1u, explanations.neutral_explanations.size());
 }
 
 // Tests that an explanation is provided if a certificate is missing a
 // subjectAltName extension containing a domain name or IP address.
 TEST(SecurityStateContentUtilsTest, SubjectAltNameWarning) {
   security_state::SecurityInfo security_info;
   security_info.cert_status = 0;
   security_info.scheme_is_cryptographic = true;
 
   security_info.certificate = net::ImportCertFromFile(
       net::GetTestCertsDirectory(), "salesforce_com_test.pem");
   ASSERT_TRUE(security_info.certificate);
 
   content::SecurityStyleExplanations explanations;
   security_info.cert_missing_subject_alt_name = true;
   GetSecurityStyle(security_info, &explanations);
   // Verify that an explanation was shown for a missing subjectAltName.
-  EXPECT_EQ(1u, explanations.broken_explanations.size());
+  EXPECT_EQ(1u, explanations.insecure_explanations.size());
 
-  explanations.broken_explanations.clear();
+  explanations.insecure_explanations.clear();
   security_info.cert_missing_subject_alt_name = false;
   GetSecurityStyle(security_info, &explanations);
   // Verify that no explanation is shown if the subjectAltName is present.
-  EXPECT_EQ(0u, explanations.broken_explanations.size());
+  EXPECT_EQ(0u, explanations.insecure_explanations.size());
 }
 
 }  // namespace