Expand WebsiteSettings histograms for HTTP-bad

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index cb5a22c353dc48c7af68706e9ee22d107526f85a..adec102e93baa87ce061808f72a0cd2584cc4df4 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -40291,6 +40291,62 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="PageInfo.Action.Http" enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks WebsiteSettings actions that take place on an HTTP URL that does not

[lgarron, 2016/10/21 01:22:50]

Nit: "Tracks Page Info bubble actions..."

[estark, 2016/10/21 01:37:21]

Done.

+    have any warnings associated with it.

[lgarron, 2016/10/21 01:22:50]

Nit: "an omnibox security indicator warning"?

(To make it clear that e.g. Javascript console warnings aren't covered.)

[estark, 2016/10/21 01:37:21]

Done.

+  </summary>
+</histogram>
+
+<histogram name="PageInfo.Action.HttpsUrl2" enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks WebsiteSettings actions that take place on a valid HTTPS URL with no
+    security issues (e.g. no mixed content).
+  </summary>
+</histogram>
+
+<histogram name="PageInfo.Action.HttpsUrlDangerous"
+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks WebsiteSettings actions that take place on an HTTPS URL that has been
+    marked dangerous or not secure (such as for malware or broken HTTPS).
+  </summary>
+</histogram>
+
+<histogram name="PageInfo.Action.HttpsUrlDowngraded"
+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks WebsiteSettings actions that take place on a valid HTTPS URL that has
+    a security issue (e.g. no mixed content).
+  </summary>
+</histogram>
+
+<histogram name="PageInfo.Action.HttpUrlDangerous" enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks WebsiteSettings actions that take place on an HTTP URL that has been
+    marked dangerous (such as for malware).
+  </summary>
+</histogram>
+
+<histogram name="PageInfo.Action.HttpWarning" enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks WebsiteSettings actions that take place on an HTTP URL that has been
+    given a &quot;Not secure&quot; warning in the omnibox.
+  </summary>
+</histogram>
+
 <histogram name="PageLoad.AbortTiming.Background" units="ms">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
@@ -71312,6 +71368,10 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="WebsiteSettings.Action.HttpsUrl" enum="WebsiteSettingsAction">
+  <obsolete>
+    Deprecated October 2016 in favor of PageInfo.Action.HttpsUrl2 and
+    PageInfo.Action.HttpsUrlDowngraded.
+  </obsolete>
   <owner>lgarron@chromium.org</owner>
   <summary>
     Tracks WebsiteSettings actions that take place on an HTTPS URL. This