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

chrome/browser/ssl/chrome_security_state_model_client_unittest.cc

Index: chrome/browser/ssl/chrome_security_state_model_client_unittest.cc
diff --git a/chrome/browser/ssl/chrome_security_state_model_client_unittest.cc b/chrome/browser/ssl/chrome_security_state_model_client_unittest.cc
index 711c17cfcf9155fadbad38030854769bb2c2b182..6dd5c59a040620bffe0e2463bbd7a1e0d0777e1e 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client_unittest.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client_unittest.cc
@@ -18,8 +18,8 @@
 
 namespace {
 
-const char kHTTPBadHistogram[] =
-    "Security.HTTPBad.UserWarnedAboutSensitiveInput";
+const char kHTTPBadHistogramPassword[] =
+    "Security.HTTPBad.UserWarnedAboutSensitiveInput.Password";
 
 // Tests that SecurityInfo flags for subresources with certificate
 // errors are reflected in the SecurityStyleExplanations produced by
@@ -236,17 +236,23 @@ TEST(ChromeSecurityStateModelClientTest, HTTPWarning) {
 
 // Tests that a security level of NONE when there is a password or
 // credit card field on HTTP produces a content::SecurityStyle of
-// UNAUTHENTICATED, with an info explanation.
+// UNAUTHENTICATED, with an info explanation for each.
 TEST(ChromeSecurityStateModelClientTest, HTTPWarningInFuture) {
   security_state::SecurityStateModel::SecurityInfo security_info;
   content::SecurityStyleExplanations explanations;
   security_info.security_level = security_state::SecurityStateModel::NONE;
-  security_info.displayed_private_user_data_input_on_http = true;
+  security_info.displayed_password_field_on_http = true;
   blink::WebSecurityStyle security_style =
       ChromeSecurityStateModelClient::GetSecurityStyle(security_info,
                                                        &explanations);
   EXPECT_EQ(blink::WebSecurityStyleUnauthenticated, security_style);
   EXPECT_EQ(1u, explanations.info_explanations.size());
+
+  security_info.displayed_credit_card_field_on_http = true;

[estark, 2016/11/09 15:56:46]

Maybe you could call explanations.info_explanations.clear() here. (It's a little
confusing to see 2u on line 255 because normally |explanations| is empty when
GetSecurityStyle() is called.)

[lshang, 2016/11/10 04:53:54]

Done.

+  security_style = ChromeSecurityStateModelClient::GetSecurityStyle(
+      security_info, &explanations);
+  EXPECT_EQ(blink::WebSecurityStyleUnauthenticated, security_style);
+  EXPECT_EQ(2u, explanations.info_explanations.size());

[estark, 2016/11/09 15:56:46]

Could you please add another section that one info explanation is added if
*both* the password and credit card fields are true? (I'd like to have a test
that we don't add two explanations if both fields are set.)

[lshang, 2016/11/10 04:53:55]

Done.

 }
 
 class ChromeSecurityStateModelClientHistogramTest
@@ -289,17 +295,17 @@ TEST_F(ChromeSecurityStateModelClientHistogramTest,
 
   base::HistogramTester histograms;
   signal_password();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 1);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, true, 1);
 
   // Fire again and ensure no sample is recorded.
   signal_password();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 1);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, true, 1);
 
   // Navigate to a new page and ensure a sample is recorded.
   navigate_to_http();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 1);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, true, 1);
   signal_password();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 2);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, true, 2);
 }
 
 // Tests that UMA logs the console warning when security level is NONE.
@@ -312,17 +318,17 @@ TEST_F(ChromeSecurityStateModelClientHistogramTest,
 
   base::HistogramTester histograms;
   signal_password();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 1);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, false, 1);
 
   // Fire again and ensure no sample is recorded.
   signal_password();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 1);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, false, 1);
 
   // Navigate to a new page and ensure a sample is recorded.
   navigate_to_http();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 1);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, false, 1);
   signal_password();
-  histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 2);
+  histograms.ExpectUniqueSample(kHTTPBadHistogramPassword, false, 2);
 }
 

[estark, 2016/11/09 15:56:46]

I think you can also use INSTANTIATE_TEST_CASE_P for unit tests. Could you use
that here so that each of these tests runs for both the password histogram and
the credit card histogram?

[lshang, 2016/11/10 04:53:55]

Done.

 }  // namespace