Revert "HTTP Bad: Split out UMA metrics for password vs credit card "Not secure" warnings"

components/security_state/security_state_model_unittest.cc

Index: components/security_state/security_state_model_unittest.cc
diff --git a/components/security_state/security_state_model_unittest.cc b/components/security_state/security_state_model_unittest.cc
index 082b6a08b5f67231f04aee44effb540e4a7d5070..7776a0c5ba5e492df8a36efef7d189ad3a2db7c9 100644
--- a/components/security_state/security_state_model_unittest.cc
+++ b/components/security_state/security_state_model_unittest.cc
@@ -251,7 +251,7 @@ TEST(SecurityStateModelTest, PasswordFieldWarning) {
   client.set_displayed_password_field_on_http(true);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
-  EXPECT_TRUE(security_info.displayed_password_field_on_http);
+  EXPECT_TRUE(security_info.displayed_private_user_data_input_on_http);
   EXPECT_EQ(SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
 }
@@ -269,7 +269,7 @@ TEST(SecurityStateModelTest, CreditCardFieldWarning) {
   client.set_displayed_credit_card_field_on_http(true);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
-  EXPECT_TRUE(security_info.displayed_credit_card_field_on_http);
+  EXPECT_TRUE(security_info.displayed_private_user_data_input_on_http);
   EXPECT_EQ(SecurityStateModel::HTTP_SHOW_WARNING,
             security_info.security_level);
 }
@@ -283,20 +283,15 @@ TEST(SecurityStateModelTest, HttpWarningNotSetWithoutSwitch) {
   SecurityStateModel model;
   model.SetClient(&client);
   client.set_displayed_password_field_on_http(true);
-  SecurityStateModel::SecurityInfo security_info;
-  model.GetSecurityInfo(&security_info);
-  EXPECT_TRUE(security_info.displayed_password_field_on_http);
-  EXPECT_EQ(SecurityStateModel::NONE, security_info.security_level);
-
   client.set_displayed_credit_card_field_on_http(true);
+  SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
-  EXPECT_TRUE(security_info.displayed_credit_card_field_on_http);
+  EXPECT_TRUE(security_info.displayed_private_user_data_input_on_http);
   EXPECT_EQ(SecurityStateModel::NONE, security_info.security_level);
 }
 
-// Tests that neither |displayed_password_field_on_http| nor
-// |displayed_credit_card_field_on_http| is set when the corresponding
-// VisibleSecurityState flags are not set.
+// Tests that |displayed_private_user_data_input_on_http| is not set
+// when the corresponding VisibleSecurityState flags are not set.
 TEST(SecurityStateModelTest, PrivateUserDataNotSet) {
   TestSecurityStateModelClient client;
   client.UseHttpUrl();
@@ -304,8 +299,7 @@ TEST(SecurityStateModelTest, PrivateUserDataNotSet) {
   model.SetClient(&client);
   SecurityStateModel::SecurityInfo security_info;
   model.GetSecurityInfo(&security_info);
-  EXPECT_FALSE(security_info.displayed_password_field_on_http);
-  EXPECT_FALSE(security_info.displayed_credit_card_field_on_http);
+  EXPECT_FALSE(security_info.displayed_private_user_data_input_on_http);
   EXPECT_EQ(SecurityStateModel::NONE, security_info.security_level);
 }