Add logging for distinguishing between captive portals with HTTP and HTTPS login pages

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 7257711da28fa082263ae9b6e2c44ac1424e0ba2..ebf8b290b43ed7dc97e6666725044aef9d15c6e4 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -1751,6 +1751,11 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="CaptivePortal.DetectResult" enum="CaptivePortalDetectResult">
+  <owner>mmenke@chromium.org</owner>

[mmenke, 2014/03/26 17:23:21]

Should I really be the owner of this?  If we were recording the results in the
captive_portal files, I'd be fine with that, but given that this is living in
the SSL interstitial code, I don't think I'm the right person.

[meacer, 2014/03/26 17:59:32]

Sure, I can be the owner. I added you since I thought you were the initial
implementor.

+  <summary>Records the result of a captive portal probe.</summary>
+</histogram>
+
 <histogram name="CaptivePortal.Notification.Status"
     enum="CaptivePortalNotificationStatus">
   <owner>ygorshenin@chromium.org</owner>
@@ -29790,6 +29795,24 @@ other types of suffix sets.
   <int value="3" label="webgl"/>
 </enum>
 
+<enum name="CaptivePortalDetectResult" type="int">
+  <int value="0" label="RESULT_INTERNET_CONNECTED">
+    There's a confirmed connection to the Internet.
+  </int>
+  <int value="1" label="RESULT_NO_RESPONSE">
+    Received a network or HTTP error, or a non-HTTP response.
+  </int>
+  <int value="2" label="RESULT_BEHIND_CAPTIVE_PORTAL">
+    Encountered a captive portal with an HTTP login page.
+  </int>
+  <int value="3" label="RESULT_NO_RESPONSE_HTTPS">
+    Received a network or HTTP error with an HTTPS login URL.
+  </int>
+  <int value="4" label="RESULT_BEHIND_CAPTIVE_PORTAL_HTTPS">
+    Encountered a captive portal with an HTTPS login page.
+  </int>
+</enum>
+
 <enum name="CaptivePortalNotificationStatus" type="int">
   <int value="0" label="UNKNOWN"/>
   <int value="1" label="OFFLINE"/>