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 67fe38c5458529de58356a15e206fd93af4bffef..afd4191cc94e9ec179210be3b4dce639c8c0ffbb 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -889,8 +889,10 @@ TEST_P(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
     alternative_service_info_vector.push_back(
         AlternativeServiceInfo(alternative_service, 1.0, expiration));
     HostPortPair host_port_pair(alternative_service.host_port_pair());
+    SchemeOriginPair scheme_origin_pair("https", host_port_pair);
+
     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"));
@@ -933,8 +935,10 @@ TEST_P(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) {
     alternative_service_info_vector.push_back(
         AlternativeServiceInfo(alternative_service, 1.0, expiration));
     HostPortPair host_port_pair(alternative_service.host_port_pair());
+    SchemeOriginPair scheme_origin_pair("https", host_port_pair);
+
     http_server_properties.SetAlternativeServices(
-        host_port_pair, alternative_service_info_vector);
+        scheme_origin_pair, alternative_service_info_vector);
 
     SpdySessionDependencies session_deps(GetParam());
 
@@ -1566,8 +1570,9 @@ class HttpStreamFactoryBidirectionalQuicTest
     alternative_service_info_vector.push_back(
         AlternativeServiceInfo(alternative_service, 1.0, expiration));
     HostPortPair host_port_pair(alternative_service.host_port_pair());
+    SchemeOriginPair scheme_origin_pair("https", host_port_pair);
     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_; }
@@ -1887,7 +1892,8 @@ TEST_P(HttpStreamFactoryTest, DISABLED_OrphanedWebSocketStream) {
 
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   session->http_server_properties()->SetAlternativeService(
-      HostPortPair("www.google.com", 8888),
+      SchemeOriginPair(request_info.url.scheme(),
+                       HostPortPair("www.google.com", 8888)),
       AlternativeService(NPN_HTTP_2, "www.google.com", 9999), 1.0, expiration);
 
   SSLConfig ssl_config;