SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data.

components/cronet/android/cronet_url_request_context_adapter.cc

Index: components/cronet/android/cronet_url_request_context_adapter.cc
diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc
index 883cdc68c8868b045ad96d561ba3fe5fd37380db..d7d3d12100eb9b19016b0a98a01b9d552b1e3270 100644
--- a/components/cronet/android/cronet_url_request_context_adapter.cc
+++ b/components/cronet/android/cronet_url_request_context_adapter.cc
@@ -602,13 +602,12 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread(
         continue;
       }
 
-      net::HostPortPair quic_hint_host_port_pair(canon_host,
-                                                 quic_hint.port);
+      url::SchemeHostPort quic_server("https", canon_host, quic_hint.port);
       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());
     }
   }