Change SupportsSpdy dict, SpdySettingsMap, ServerNetworkStatsMap, AlternativeServiceMap and disk da…

components/cronet/android/url_request_context_adapter.cc

Index: components/cronet/android/url_request_context_adapter.cc
diff --git a/components/cronet/android/url_request_context_adapter.cc b/components/cronet/android/url_request_context_adapter.cc
index e65753b995ba03d4bb8849424f337a096b0fffa5..4a59ed35d4dbcf6b66d3013ed6a5e68351ce4431 100644
--- a/components/cronet/android/url_request_context_adapter.cc
+++ b/components/cronet/android/url_request_context_adapter.cc
@@ -196,13 +196,12 @@ void URLRequestContextAdapter::InitRequestContextOnNetworkThread() {
         continue;
       }
 
-      net::HostPortPair quic_hint_host_port_pair(canon_host,
-                                                 quic_hint.port);
+      url::SchemeHostPort quic_server("https", canon_host, quic_hint.port);

[mmenke, 2016/04/21 18:52:34]

include url/scheme_host_port.h

[Zhongyi Shi, 2016/04/21 19:44:29]

Done.

       net::AlternativeService alternative_service(
           net::AlternateProtocol::QUIC, "",
           static_cast<uint16_t>(quic_hint.alternate_port));
       context_->http_server_properties()->SetAlternativeService(
-          quic_hint_host_port_pair, alternative_service, base::Time::Max());
+          quic_server, alternative_service, base::Time::Max());
     }
   }
   load_disable_cache_ = config_->load_disable_cache;