Change the AlternativeServiceMap with SchemeOriginPair key.

net/http/http_stream_factory.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_H_
 
 #include <list>
 #include <string>
 
@@ skipping 183 matching lines @@
 
   // Returns socket-layer connection attempts made for this stream request.
   virtual const ConnectionAttempts& connection_attempts() const = 0;
 };
 
 // The HttpStreamFactory defines an interface for creating usable HttpStreams.
 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);
 
   // Virtual interface methods.
 
   // Request a stream.
   // Will call delegate->OnStreamReady on successful completion.
   virtual HttpStreamRequest* RequestStream(
       const HttpRequestInfo& info,
       RequestPriority priority,
@@ skipping 46 matching lines @@
   }
   static bool spdy_enabled() { return spdy_enabled_; }
 
  protected:
   HttpStreamFactory();
 
  private:
   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_;
 
   HostPortPair RewriteHost(HostPortPair host_port_pair);
 
   DISALLOW_COPY_AND_ASSIGN(HttpStreamFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_H_