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 9f0f16be938fb82af21bb52fbf60ef9e2a80baa5..d7b00cdd36e86c6ce973f2ee451fbb8d8ff37fab 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -9059,6 +9059,14 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="interstitial.captive_portal"
+    enum="CaptivePortalBlockingPageEvent">
+  <owner>meacer@chromium.org</owner>
+  <summary>
+    User action when the user is shown a captive portal error page.
+  </summary>
+</histogram>
+
 <histogram name="interstitial.common_name_invalid_time" units="milliseconds">
   <obsolete>
     Removed on 8/1/13.
@@ -9109,6 +9117,11 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="interstitial.ssl_error_handler" enum="SSLErrorHandlerEvent">
+  <owner>meacer@chromium.org</owner>
+  <summary>The type of action that the SSL error handler takes.</summary>
+</histogram>
+
 <histogram name="interstitial.ssl_error_type" enum="SSLErrorTypes">
   <owner>felt@chromium.org</owner>
   <summary>
@@ -33690,6 +33703,12 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="3" label="webgl"/>
 </enum>
 
+<enum name="CaptivePortalBlockingPageEvent" type="int">
+  <int value="0" label="SHOW_ALL"/>
+  <int value="1" label="OPEN_LOGIN_PAGE"/>
+  <int value="2" label="MORE"/>
+</enum>
+
 <enum name="CaptivePortalDetectResult" type="int">
   <int value="0" label="INTERNET_CONNECTED"/>
   <int value="1" label="NO_RESPONSE"/>
@@ -44310,6 +44329,17 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="49323" label="TLS_PSK_DHE_WITH_AES_256_CCM_8"/>
 </enum>
 
+<enum name="SSLErrorHandlerEvent" type="int">
+  <int value="0" label="HANDLE_ALL"/>
+  <int value="1" label="CAPTIVE_PORTAL_CHECK"/>
+  <int value="2" label="CAPTIVE_PORTAL_RESULT_ALREADY_HANDLED"/>
+  <int value="3" label="CAPTIVE_PORTAL_RESULT_BEFORE_TIMER"/>
+  <int value="4" label="SSL_WARNING_ALREADY_HANDLED"/>
+  <int value="5" label="SHOW_CAPTIVE_PORTAL_INTERSTITIAL"/>
+  <int value="6" label="SHOW_SSL_INTERSTITIAL"/>
+  <int value="7" label="SHOW_SSL_INTERSTITIAL_WITHOUT_CAPTIVE_PORTAL_CHECK"/>
+</enum>
+
 <enum name="SSLErrorTypes" type="int">
   <int value="0" label="CERT_COMMON_NAME_INVALID"/>
   <int value="1" label="CERT_DATE_INVALID"/>