Change the AlternativeServiceMap with SchemeOriginPair key.

net/http/http_network_transaction.cc

Index: net/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 14da6c704043fa978c227136eaa45191ce371729..a7b631565769e8a206db90b9a74460b8df7266df 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -73,7 +73,7 @@ namespace {
 
 void ProcessAlternativeServices(HttpNetworkSession* session,
                                 const HttpResponseHeaders& headers,
-                                const HostPortPair& http_host_port_pair) {
+                                const SchemeOriginPair& scheme_origin_pair) {
   if (session->params().parse_alternative_services) {
     if (headers.HasHeader(kAlternativeServiceHeader)) {
       std::string alternative_service_str;
@@ -81,7 +81,7 @@ void ProcessAlternativeServices(HttpNetworkSession* session,
                                   &alternative_service_str);
       session->http_stream_factory()->ProcessAlternativeService(
           session->http_server_properties(), alternative_service_str,
-          http_host_port_pair, *session);
+          scheme_origin_pair, *session);
     }
     // If "Alt-Svc" is enabled, then ignore "Alternate-Protocol".
     return;
@@ -103,10 +103,8 @@ void ProcessAlternativeServices(HttpNetworkSession* session,
   }
 
   session->http_stream_factory()->ProcessAlternateProtocol(
-      session->http_server_properties(),
-      alternate_protocol_values,
-      http_host_port_pair,
-      *session);
+      session->http_server_properties(), alternate_protocol_values,
+      scheme_origin_pair, *session);
 }
 
 scoped_ptr<base::Value> NetLogSSLVersionFallbackCallback(
@@ -1238,8 +1236,11 @@ int HttpNetworkTransaction::DoReadHeadersComplete(int result) {
     return OK;
   }
 
+  SchemeOriginPair scheme_origin_pair =
+      SchemeOriginPair::FromURL(request_->url);
+
   ProcessAlternativeServices(session_, *response_.headers.get(),
-                             HostPortPair::FromURL(request_->url));
+                             scheme_origin_pair);
 
   int rv = HandleAuthChallenge();
   if (rv != OK)