Change the AlternativeServiceMap with SchemeOriginPair key.

net/http/http_stream_factory.h

Index: net/http/http_stream_factory.h
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index 59956e1c24fb6c69d01b2f3f260b6edd385436d0..f8cbfcfe5c0d680d95238488cbd67231a68a1139 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h
@@ -201,9 +201,10 @@ class NET_EXPORT HttpStreamFactory {
  public:
   virtual ~HttpStreamFactory();
 
-  void ProcessAlternativeServices(HttpNetworkSession* session,
-                                  const HttpResponseHeaders* headers,
-                                  const HostPortPair& http_host_port_pair);
+  void ProcessAlternativeServices(
+      HttpNetworkSession* session,
+      const HttpResponseHeaders* headers,
+      const url::SchemeHostPort& scheme_origin_pair);
 
   GURL ApplyHostMappingRules(const GURL& url, HostPortPair* endpoint);
 
@@ -270,13 +271,13 @@ class NET_EXPORT HttpStreamFactory {
   void ProcessAlternativeService(
       const base::WeakPtr<HttpServerProperties>& http_server_properties,
       base::StringPiece alternative_service_str,
-      const HostPortPair& http_host_port_pair,
+      const url::SchemeHostPort& http_host_port_pair,
       const HttpNetworkSession& session);
 
   void ProcessAlternateProtocol(
       const base::WeakPtr<HttpServerProperties>& http_server_properties,
       const std::vector<std::string>& alternate_protocol_values,
-      const HostPortPair& http_host_port_pair,
+      const url::SchemeHostPort& http_host_port_pair,
       const HttpNetworkSession& session);
 
   static bool spdy_enabled_;