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..a0b6aa980c9ede655128513af7c7aa230196153a 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -71311,7 +71311,20 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="WebsiteSettings.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
+    have any warnings associated with it.
+  </summary>
+</histogram>
+
 <histogram name="WebsiteSettings.Action.HttpsUrl" enum="WebsiteSettingsAction">
+  <obsolete>
+    Deprecated October 2016 in favor of WebsiteSettings.Action.HttpsUrl2 and
+    WebsiteSettings.Action.HttpsUrlDowngraded.
+  </obsolete>
   <owner>lgarron@chromium.org</owner>
   <summary>
     Tracks WebsiteSettings actions that take place on an HTTPS URL. This
@@ -71319,6 +71332,55 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="WebsiteSettings.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="WebsiteSettings.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="WebsiteSettings.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="WebsiteSettings.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="WebsiteSettings.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="WebsiteSettings.Menu.PermissionChanged" enum="ContentType">
   <owner>miguelg@chromium.org</owner>
   <owner>finnur@chromium.org</owner>