Revert of Add a probability to Alternate-Protocol support.

net/http/http_stream_factory_impl.cc

Index: net/http/http_stream_factory_impl.cc
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
index dd6d18b99d37deea2d487f93386be7c3becf0492..ad12091b1f1f441954f83a87955b6fc6d997e2fa 100644
--- a/net/http/http_stream_factory_impl.cc
+++ b/net/http/http_stream_factory_impl.cc
@@ -22,8 +22,9 @@
 
 namespace {
 
-const AlternateProtocolInfo kNoAlternateProtocol =
-    AlternateProtocolInfo(0,  UNINITIALIZED_ALTERNATE_PROTOCOL, 0);
+const PortAlternateProtocolPair kNoAlternateProtocol = {
+  0,  UNINITIALIZED_ALTERNATE_PROTOCOL
+};
 
 GURL UpgradeUrlToHttps(const GURL& original_url, int port) {
   GURL::Replacements replacements;
@@ -110,7 +111,7 @@
                                  net_log);
 
   GURL alternate_url;
-  AlternateProtocolInfo alternate =
+  PortAlternateProtocolPair alternate =
       GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
   Job* alternate_job = NULL;
   if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
@@ -154,7 +155,7 @@
     const SSLConfig& proxy_ssl_config) {
   DCHECK(!for_websockets_);
   GURL alternate_url;
-  AlternateProtocolInfo alternate =
+  PortAlternateProtocolPair alternate =
       GetAlternateProtocolRequestFor(request_info.url, &alternate_url);
   Job* job = NULL;
   if (alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL) {
@@ -175,7 +176,7 @@
   return session_->params().host_mapping_rules;
 }
 
-AlternateProtocolInfo HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
+PortAlternateProtocolPair HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
     const GURL& original_url,
     GURL* alternate_url) {
   if (!session_->params().use_alternate_protocols)
@@ -192,7 +193,7 @@
   if (!http_server_properties.HasAlternateProtocol(origin))
     return kNoAlternateProtocol;
 
-  AlternateProtocolInfo alternate =
+  PortAlternateProtocolPair alternate =
       http_server_properties.GetAlternateProtocol(origin);
   if (alternate.protocol == ALTERNATE_PROTOCOL_BROKEN) {
     HistogramAlternateProtocolUsage(