Refactor the captive portal code to move from the ssl_blocking_page class to the ssl_error_classific

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 57cf8b8d0ca85ad591f5f27f5b1e447c86e08bac..bc608f3d42f2d35e12bc91bd62a96b13fbf5e3e3 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -9953,6 +9953,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>

[Mark P, 2014/08/13 20:07:56]

Histogram descriptions should clearly state when the histogram is emitted to
(network request received? etc.).

Also, please briefly mention what a captive portal is.

+</histogram>
+
 <histogram name="interstitial.ssl.cause.nonoverridable"
     enum="SSLNonAttackCauses">
   <owner>felt@chromium.org</owner>
@@ -48272,6 +48277,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"/>
@@ -48637,6 +48667,14 @@ Therefore, the affected-histogram name has to have at least one dot in it.
       label="HOST_NAME_NOT_KNOWN_TLD: The host name is not a known TLD">
     This cause is recorded only for CERT_COMMON_NAME_INVALID errors.
   </int>
+  <int value="7"
+      label="LIKELY_MULTI_TENANT_HOSTING: The certificate is a shared
+             certificate">
+    This cause is recorded only for CERT_COMMON_NAME_INVALID errors. It is
+    possible that this error overlaps with others but it is not likely because
+    of the heuristics which decide as to what constitutes a shared certificate.
+    In cases of overlap, we emit to only one bucket.

[Mark P, 2014/08/13 20:07:56]

I thought you already submitted this fragment.  Please rebase.

[radhikabhar, 2014/08/14 18:16:29]

Done.

+  </int>
 </enum>
 
 <enum name="SSLResponseTypesV2" type="int">
@@ -48660,26 +48698,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)"/>

[Mark P, 2014/08/13 20:07:56]

Do you have replacements for these deprecated values?  If so, you add code to
emit them and add their values to the enum.

[radhikabhar, 2014/08/14 18:16:29]

Done.

 </enum>
 
 <enum name="StartupURLsMigration" type="int">