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

net/quic/quic_stream_factory_test.cc

Index: net/quic/quic_stream_factory_test.cc
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 5a64cb1793f5e3e2d082ef8c47b14bc76477fadb..be57df60989f9a2a9f78f8ace369d1b9f621a94e 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -2700,8 +2700,11 @@ TEST_P(QuicStreamFactoryTest, RacingConnections) {
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, expiration));
 
+  url::SchemeHostPort server("https", kDefaultServerHostName,
+                             kDefaultServerPort);
+
   http_server_properties_.SetAlternativeServices(
-      host_port_pair_, alternative_service_info_vector);
+      server, alternative_service_info_vector);
 
   crypto_client_stream_factory_.set_handshake_mode(
       MockCryptoClientStream::ZERO_RTT);
@@ -3800,18 +3803,20 @@ TEST_P(QuicStreamFactoryTest, MaybeInitialize) {
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, expiration));
-
+  url::SchemeHostPort server("https", kDefaultServerHostName,
+                             kDefaultServerPort);
   http_server_properties_.SetAlternativeServices(
-      host_port_pair_, alternative_service_info_vector);
+      server, alternative_service_info_vector);
 
   HostPortPair host_port_pair2(kServer2HostName, kDefaultServerPort);
+  url::SchemeHostPort server2("https", kServer2HostName, kDefaultServerPort);
   const AlternativeService alternative_service2(QUIC, host_port_pair2.host(),
                                                 host_port_pair2.port());
   AlternativeServiceInfoVector alternative_service_info_vector2;
   alternative_service_info_vector2.push_back(
       AlternativeServiceInfo(alternative_service2, expiration));
   http_server_properties_.SetAlternativeServices(
-      host_port_pair2, alternative_service_info_vector2);
+      server2, alternative_service_info_vector2);
 
   http_server_properties_.SetMaxServerConfigsStoredInProperties(
       kMaxQuicServersToPersist);