SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data.

net/http/http_server_properties.h

Index: net/http/http_server_properties.h
diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h
index 4a1d0026e2de971671d61ec2a460b8435c449448..fb8aaa405c24fa59697ef0115ef2e5c31ad08e70 100644
--- a/net/http/http_server_properties.h
+++ b/net/http/http_server_properties.h
@@ -204,7 +204,7 @@ struct NET_EXPORT ServerNetworkStats {
 
 typedef std::vector<AlternativeService> AlternativeServiceVector;
 typedef std::vector<AlternativeServiceInfo> AlternativeServiceInfoVector;
-typedef base::MRUCache<HostPortPair, AlternativeServiceInfoVector>
+typedef base::MRUCache<url::SchemeHostPort, AlternativeServiceInfoVector>
     AlternativeServiceMap;
 typedef base::MRUCache<url::SchemeHostPort, SettingsMap> SpdySettingsMap;
 typedef base::MRUCache<url::SchemeHostPort, ServerNetworkStats>
@@ -265,14 +265,14 @@ class NET_EXPORT HttpServerProperties {
   // Return all alternative services for |origin|, including broken ones.
   // Returned alternative services never have empty hostnames.
   virtual AlternativeServiceVector GetAlternativeServices(
-      const HostPortPair& origin) = 0;
+      const url::SchemeHostPort& origin) = 0;
 
   // Set a single alternative service for |origin|.  Previous alternative
   // services for |origin| are discarded.
   // |alternative_service.host| may be empty.
   // Return true if |alternative_service_map_| is changed.
   virtual bool SetAlternativeService(
-      const HostPortPair& origin,
+      const url::SchemeHostPort& origin,
       const AlternativeService& alternative_service,
       base::Time expiration) = 0;
 
@@ -281,7 +281,7 @@ class NET_EXPORT HttpServerProperties {
   // Hostnames in |alternative_service_info_vector| may be empty.
   // Return true if |alternative_service_map_| is changed.
   virtual bool SetAlternativeServices(
-      const HostPortPair& origin,
+      const url::SchemeHostPort& origin,
       const AlternativeServiceInfoVector& alternative_service_info_vector) = 0;
 
   // Marks |alternative_service| as broken.
@@ -310,7 +310,7 @@ class NET_EXPORT HttpServerProperties {
       const AlternativeService& alternative_service) = 0;
 
   // Clear all alternative services for |origin|.
-  virtual void ClearAlternativeServices(const HostPortPair& origin) = 0;
+  virtual void ClearAlternativeServices(const url::SchemeHostPort& origin) = 0;
 
   // Returns all alternative service mappings.
   // Returned alternative services may have empty hostnames.