Change the AlternativeServiceMap with SchemeOriginPair key.

net/http/http_stream_factory_impl_unittest.cc

Index: net/http/http_stream_factory_impl_unittest.cc
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index f95ea511fa3a17985f9b717ea06375915ddd33c2..ea05d2432b9bf3f86b2692afabf2b85100f059c0 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -876,8 +876,11 @@ TEST_P(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
     alternative_service_info_vector.push_back(
         AlternativeServiceInfo(alternative_service, expiration));
     HostPortPair host_port_pair(alternative_service.host_port_pair());
+    url::SchemeHostPort scheme_origin_pair("https", host_port_pair.host(),
+                                           host_port_pair.port());
+
     http_server_properties.SetAlternativeServices(
-        host_port_pair, alternative_service_info_vector);
+        scheme_origin_pair, alternative_service_info_vector);
 
     SpdySessionDependencies session_deps(
         GetParam(), ProxyService::CreateFixed("http_proxy"));
@@ -920,8 +923,11 @@ TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) {
     alternative_service_info_vector.push_back(
         AlternativeServiceInfo(alternative_service, expiration));
     HostPortPair host_port_pair(alternative_service.host_port_pair());
+    url::SchemeHostPort scheme_origin_pair("https", host_port_pair.host(),
+                                           host_port_pair.port());
+
     http_server_properties.SetAlternativeServices(
-        host_port_pair, alternative_service_info_vector);
+        scheme_origin_pair, alternative_service_info_vector);
 
     SpdySessionDependencies session_deps(GetParam());
 
@@ -1558,8 +1564,10 @@ class HttpStreamFactoryBidirectionalQuicTest
     alternative_service_info_vector.push_back(
         AlternativeServiceInfo(alternative_service, expiration));
     HostPortPair host_port_pair(alternative_service.host_port_pair());
+    url::SchemeHostPort scheme_origin_pair("https", host_port_pair.host(),
+                                           host_port_pair.port());
     http_server_properties_.SetAlternativeServices(
-        host_port_pair, alternative_service_info_vector);
+        scheme_origin_pair, alternative_service_info_vector);
   };
 
   test::QuicTestPacketMaker& packet_maker() { return packet_maker_; }
@@ -2005,8 +2013,10 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
   request_info.load_flags = 0;
 
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
+  HostPortPair host_port_pair("www.google.com", 8888);
   session->http_server_properties()->SetAlternativeService(
-      HostPortPair("www.google.com", 8888),
+      url::SchemeHostPort(request_info.url.scheme(), host_port_pair.host(),
+                          host_port_pair.port()),
       AlternativeService(NPN_HTTP_2, "www.google.com", 9999), expiration);
 
   SSLConfig ssl_config;