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 bd68078331b8a6a56f6ce665f1da3772eb4126ce..59a1d93460b453a1c3bf8630af6222aa31b99cd5 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -40470,6 +40470,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 Page Info bubble actions that take place on an HTTP URL that does not
+    have an omnibox security indicator warning associated with it.
+  </summary>
+</histogram>

[Ilya Sherman, 2016/10/21 16:27:09]

I don't see this histogram being recorded in the C++ code.  Am I just missing
it?

[estark, 2016/10/21 17:02:57]

Uh oh! Thanks for catching that. Done.

+
+<histogram name="PageInfo.Action.HttpsUrl2" enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubbleactions that take place on a valid HTTPS URL with no

[Ilya Sherman, 2016/10/21 16:27:09]

nit: s/bubbleactions/bubble actions (throughout)

[estark, 2016/10/21 17:02:57]

Done.

+    security issues (e.g. no mixed content).
+  </summary>
+</histogram>
+
+<histogram name="PageInfo.Action.HttpsUrlDangerous"

[Ilya Sherman, 2016/10/21 16:27:09]

It looks like you're adding a new top-level category, "PageInfo".  Would it be
reasonable to have these histograms under the WebSettings top-level category --
i.e. "WebSettings.PageInfo.*" -- or to add a new "Security" top-level category? 
(I'm honestly quite surprised that there isn't a "Security" top-level category
already...

[estark, 2016/10/21 17:02:57]

I had originally put these under WebsiteSettings, but it turns out that lgarron
is on an in-progress mission to rename all WebsiteSettings things to PageInfo
(see https://codereview.chromium.org/2434083002/#msg5).

Since all the existing WebsiteSettings histograms are security- or
privacy-related, I think Security.PageInfo.* would make sense; I'll rename it to
that.

+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubbleactions 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 Page Info bubbleactions that take place on a valid HTTPS URL that has
+    a security issue (e.g. no mixed content).

[Ilya Sherman, 2016/10/21 16:27:09]

nit: Should this say "e.g. mixed content" rather than "e.g. no mixed content"?

[estark, 2016/10/21 17:02:57]

Done.

+  </summary>
+</histogram>
+
+<histogram name="PageInfo.Action.HttpUrlDangerous" enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubbleactions 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">

[Ilya Sherman, 2016/10/21 16:27:09]

nit: I'd recommend using an extra dot after "Http" to group the HTTP histograms
together (and likewise for the HTTPS histograms).

[estark, 2016/10/21 17:02:57]

Done (with some naming tweaks to make them more consistent).

+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubbleactions that take place on an HTTP URL that has been
+    given a &quot;Not secure&quot; warning in the omnibox.
+  </summary>
+</histogram>
+
 <histogram base="true" name="PageLoad.AbortTiming.Background" units="ms">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
@@ -71576,6 +71632,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