[GCM] Add port 443 fallback logic and histograms

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 4298a4f057290c8a42e4282423ef7d56270df0f3..bace86a858c17b7ce1189a13610e359d3556f140 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -6561,11 +6561,21 @@ other types of suffix sets.
   <summary>Status code of the outcome of a GCM checkin request.</summary>
 </histogram>
 
+<histogram name="GCM.ConnectedViaProxy" enum="Boolean">
+  <owner>zea@chromium.org</owner>
+  <summary>Whether the GCM connection was made via a proxy or not.</summary>
+</histogram>
+
 <histogram name="GCM.ConnectionDisconnectErrorCode" enum="NetErrorCodes">
   <owner>zea@chromium.org</owner>
   <summary>Net error results from GCM disconnect events.</summary>
 </histogram>
 
+<histogram name="GCM.ConnectionEndpoint" enum="GCMEndpoints">
+  <owner>zea@chromium.org</owner>
+  <summary>Number of connections made to each specific MCS endpoint.</summary>
+</histogram>
+
 <histogram name="GCM.ConnectionFailureErrorCode" enum="NetErrorCodes">
   <owner>zea@chromium.org</owner>
   <summary>Net error results from GCM connection attempts.</summary>
@@ -6576,7 +6586,7 @@ other types of suffix sets.
   <summary>Reasons for GCM connection resets.</summary>
 </histogram>
 
-<histogram name="GCM.ConnectionSuccessRate">
+<histogram name="GCM.ConnectionSuccessRate" enum="BooleanSuccess">
   <owner>zea@chromium.org</owner>
   <summary>
     GCM connection success rate. Does not take into account login success. See
@@ -32455,6 +32465,11 @@ other types of suffix sets.
   <int value="3" label="Socket failure"/>
 </enum>
 
+<enum name="GCMEndpoints" type="int">
+  <int value="0" label="mtalk.google.com:5228"/>
+  <int value="1" label="mtalk.google.com:443"/>
+</enum>
+
 <enum name="GCMRegistrationRequestStatus" type="int">
   <int value="0" label="Success (this is not logged currently)"/>
   <int value="1" label="Invalid parameters"/>