Split Security.PageInfo.Action.HttpsUrl.Valid histogram.

In preparation for an EV study, metrics from PageInfo actions need to
be separate for SECURE sites and EV_SECURE sites. This CL deprecates
the Security.PageInfo.Action.HttpsUrl.Valid histogram and creates
Security.PageInfo.Action.HttpsUrl.ValidEV and
Security.PageInfo.Action.HttpsUrl.ValidNonEV.

Bug: 803530
Change-Id: I0e28b0ac7b53d3838cb74b61d10662d9d446fd18
Reviewed-on: https://chromium-review.googlesource.com/896184Reviewed-by: Emily Stark <estark@chromium.org>
Reviewed-by: Gayane Petrosyan <gayane@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533732}

chrome/browser/ui/page_info/page_info.cc

@@ -386,9 +386,11 @@ void PageInfo::RecordPageInfoAction(PageInfoAction action) {
 
   std::string histogram_name;
   if (site_url_.SchemeIsCryptographic()) {
-    if (security_level_ == security_state::SECURE ||
-        security_level_ == security_state::EV_SECURE) {
-      UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpsUrl.Valid",
+    if (security_level_ == security_state::SECURE) {
+      UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpsUrl.ValidNonEV",
+                                action, PAGE_INFO_COUNT);
+    } else if (security_level_ == security_state::EV_SECURE) {
+      UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpsUrl.ValidEV",
                                 action, PAGE_INFO_COUNT);
     } else if (security_level_ == security_state::NONE) {
       UMA_HISTOGRAM_ENUMERATION("Security.PageInfo.Action.HttpsUrl.Downgraded",

chrome/browser/ui/page_info/page_info_unittest.cc

@@ -915,9 +915,9 @@ TEST_F(PageInfoTest, SecurityLevelMetrics) {
 
   const TestCase kTestCases[] = {
       {"https://example.test", security_state::SECURE,
-       "Security.PageInfo.Action.HttpsUrl.Valid"},
+       "Security.PageInfo.Action.HttpsUrl.ValidNonEV"},
       {"https://example.test", security_state::EV_SECURE,
-       "Security.PageInfo.Action.HttpsUrl.Valid"},
+       "Security.PageInfo.Action.HttpsUrl.ValidEV"},
       {"https://example2.test", security_state::NONE,
        "Security.PageInfo.Action.HttpsUrl.Downgraded"},
       {"https://example.test", security_state::DANGEROUS,

tools/metrics/histograms/histograms.xml

@@ -79151,6 +79151,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="Security.PageInfo.Action.HttpsUrl.Valid"
     enum="WebsiteSettingsAction">
+  <obsolete>
+    Deprecated 2018-01-31, split into ValidEV and ValidNonEV.
+  </obsolete>
   <owner>estark@chromium.org</owner>
   <summary>
     Tracks Page Info bubble actions that take place on a valid HTTPS URL with no
@@ -79158,6 +79161,26 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Security.PageInfo.Action.HttpsUrl.ValidEV"
+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubble actions that take place on a valid HTTPS URL with no
+    security issues (e.g. no mixed content) and an Extended Validation
+    Certificate.
+  </summary>
+</histogram>
+
+<histogram name="Security.PageInfo.Action.HttpsUrl.ValidNonEV"
+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubble actions that take place on a valid HTTPS URL with no
+    security issues (e.g. no mixed content), but no Extended Validation
+    Certificate.
+  </summary>
+</histogram>
+
 <histogram name="Security.PageInfo.Action.HttpUrl.Dangerous"
     enum="WebsiteSettingsAction">
   <owner>estark@chromium.org</owner>