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 f9cf99d7df9b2a71517452a2d7a5475955ca65fb..8d4204fabe7e6fdcb60d3c0ff41c41b9fc1ddd44 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -10878,6 +10878,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.
@@ -11070,6 +11078,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>
@@ -40032,6 +40045,11 @@ 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"/>
+</enum>
+
 <enum name="CaptivePortalDetectResult" type="int">
   <int value="0" label="INTERNET_CONNECTED"/>
   <int value="1" label="NO_RESPONSE"/>
@@ -52723,6 +52741,22 @@ To add a new entry, add it with any value and run test to compute valid value.
   <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_TRIGGER"/>
+  <int value="4" label="CAPTIVE_PORTAL_RESULT_AFTER_TIMER_EXPIRE"/>
+  <int value="5" label="SSL_WARNING_ALREADY_HANDLED"/>
+  <int value="6" label="SHOW_CAPTIVE_PORTAL_INTERSTITIAL"/>
+  <int value="7" label="SHOW_CAPTIVE_PORTAL_INTERSTITIAL_OVERRIDABLE"/>
+  <int value="8" label="SHOW_SSL_INTERSTITIAL"/>
+  <int value="9" label="SHOW_SSL_INTERSTITIAL_OVERRIDABLE"/>
+  <int value="10" label="SHOW_SSL_INTERSTITIAL_WITHOUT_CAPTIVE_PORTAL_CHECK"/>
+  <int value="11"
+      label="SHOW_SSL_INTERSTITIAL_WITHOUT_CAPTIVE_PORTAL_CHECK_OVERRIDABLE"/>
+</enum>
+
 <enum name="SSLErrorTypes" type="int">
   <int value="0" label="CERT_COMMON_NAME_INVALID"/>
   <int value="1" label="CERT_DATE_INVALID"/>