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 49faed22112be2e7d07be5c8fe94c313de0f3fe7..dca893a46aa2e01a19c02979e89f5242c6535864 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -56045,6 +56045,66 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Security.PageInfo.Action.HttpsUrl.Dangerous"
+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubble 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="Security.PageInfo.Action.HttpsUrl.Downgraded"
+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@chromium.org</owner>
+  <summary>
+    Tracks Page Info bubble actions that take place on a valid HTTPS URL that
+    has a security issue (e.g. mixed content).
+  </summary>
+</histogram>
+
+<histogram name="Security.PageInfo.Action.HttpsUrl.Valid"
+    enum="WebsiteSettingsAction">
+  <owner>estark@chromium.org</owner>
+  <owner>lgarron@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).
+  </summary>
+</histogram>
+
+<histogram name="Security.PageInfo.Action.HttpUrl.Dangerous"
+    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 has been
+    marked dangerous (such as for malware).
+  </summary>
+</histogram>
+
+<histogram name="Security.PageInfo.Action.HttpUrl.Neutral"
+    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>
+
+<histogram name="Security.PageInfo.Action.HttpUrl.Warning"
+    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 has been
+    given a &quot;Not secure&quot; warning in the omnibox.
+  </summary>
+</histogram>
+
 <histogram name="SequencedWorkerPool.ShutdownDelayTime" units="ms">
   <owner>gab@chromium.org</owner>
   <summary>
@@ -71750,6 +71810,11 @@ 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 Security.PageInfo.Action.HttpsUrl.Valid,
+    Security.PageInfo.Action.HttpsUrl.Dangerous, and
+    Security.PageInfo.Action.HttpsUrl.Downgraded.
+  </obsolete>
   <owner>lgarron@chromium.org</owner>
   <summary>
     Tracks WebsiteSettings actions that take place on an HTTPS URL. This