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 61964c12832307b46d8be6a9ae9ade6776546987..3d43b1a6d6635b9d65a4452dc07f12a54608ff91 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -10233,6 +10233,11 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="interstitial.ssl.captive_portal" enum="SSLCaptivePortal">
+  <owner>meacer@chromium.org</owner>
+  <summary>Record possible states of captive portals.</summary>
+</histogram>
+
 <histogram name="interstitial.ssl.cause.nonoverridable"
     enum="SSLNonAttackCauses">
   <owner>felt@chromium.org</owner>
@@ -10264,6 +10269,24 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="interstitial.ssl.severity_score.common_name_invalid" units="%">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    The likelihood of an error being an attack for the
+    |CERT_COMMON_NAME_INVALID| error. Higher the percentage, higher the
+    probability of an error being an attack.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.ssl.severity_score.date_invalid" units="%">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    The likelihood of an error being an attack for the |CERT_DATE_INVALID|
+    error. Higher the percentage, higher the probability of an error being an
+    attack.
+  </summary>
+</histogram>
+
 <histogram name="interstitial.ssl_accept_time" units="milliseconds">
   <obsolete>
     Removed on 8/1/13.
@@ -48906,6 +48929,31 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="5" label="DEPRECATION_RAZE_FAILED">Raze failed.</int>
 </enum>
 
+<enum name="SSLCaptivePortal" type="int">
+  <int value="0"
+      label="Chrome captive portal detection enabled
+             (CAPTIVE_PORTAL_DETECTION_ENABLED)"/>
+  <int value="1"
+      label="Chrome captive portal detection enabled on an overridable SSL
+             error page (CAPTIVE_PORTAL_DETECTION_ENABLED_OVERRIDABLE)"/>
+  <int value="2"
+      label="Received a captive portal result
+             (CAPTIVE_PORTAL_PROBE_COMPLETED)"/>
+  <int value="3"
+      label="Received a captive portal result on an overridable SSL error
+             page (CAPTIVE_PORTAL_PROBE_COMPLETED_OVERRIDABLE)"/>
+  <int value="4"
+      label="Received no response or Non-HTTP login page
+             (CAPTIVE_PORTAL_NO_RESPONSE)"/>
+  <int value="5"
+      label="Received no response or Non-HTTP login page on an overridable
+             SSL error page (CAPTIVE_PORTAL_NO_RESPONSE_OVERRIDABLE)"/>
+  <int value="6" label="Detected captive portal (CAPTIVE_PORTAL_DETECTED)"/>
+  <int value="7"
+      label="Detected captive portal on an overridable SSL error page
+             (CAPTIVE_PORTAL_DETECTED_OVERRIDABLE)"/>
+</enum>
+
 <enum name="SSLCipherSuite" type="int">
   <summary>SSL/TLS cipher suites from the IANA registry</summary>
   <int value="0" label="TLS_NULL_WITH_NULL_NULL"/>
@@ -49302,26 +49350,28 @@ Therefore, the affected-histogram name has to have at least one dot in it.
       label="User manually typed proceed (PROCEED_MANUAL_NONOVERRIDABLE)"/>
   <int value="17"
       label="Chrome captive portal detection enabled
-             (CAPTIVE_PORTAL_DETECTION_ENABLED)"/>
+             (DEPRECATED_CAPTIVE_PORTAL_DETECTION_ENABLED)"/>
   <int value="18"
       label="Chrome captive portal detection enabled on an overridable SSL
-             error page (CAPTIVE_PORTAL_DETECTION_ENABLED_OVERRIDABLE)"/>
+             error page
+             (DEPRECATED_CAPTIVE_PORTAL_DETECTION_ENABLED_OVERRIDABLE)"/>
   <int value="19"
       label="Received a captive portal result
-             (CAPTIVE_PORTAL_PROBE_COMPLETED)"/>
+             (DEPRECATED_CAPTIVE_PORTAL_PROBE_COMPLETED)"/>
   <int value="20"
       label="Received a captive portal result on an overridable SSL error
-             page (CAPTIVE_PORTAL_PROBE_COMPLETED_OVERRIDABLE)"/>
+             page (DEPRECATED_CAPTIVE_PORTAL_PROBE_COMPLETED_OVERRIDABLE)"/>
   <int value="21"
       label="Received no response or Non-HTTP login page
-             (CAPTIVE_PORTAL_NO_RESPONSE)"/>
+             (DEPRECATED_CAPTIVE_PORTAL_NO_RESPONSE)"/>
   <int value="22"
       label="Received no response or Non-HTTP login page on an overridable
-             SSL error page (CAPTIVE_PORTAL_NO_RESPONSE_OVERRIDABLE)"/>
+             SSL error page
+             (DEPRECATED_CAPTIVE_PORTAL_NO_RESPONSE_OVERRIDABLE)"/>
   <int value="23" label="Detected captive portal (CAPTIVE_PORTAL_DETECTED)"/>
   <int value="24"
       label="Detected captive portal on an overridable SSL error page
-             (CAPTIVE_PORTAL_DETECTED_OVERRIDABLE)"/>
+             (DEPRECATED_CAPTIVE_PORTAL_DETECTED_OVERRIDABLE)"/>
 </enum>
 
 <enum name="StartupURLsMigration" type="int">