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

net/quic/quic_stream_factory.cc

Index: net/quic/quic_stream_factory.cc
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 44cea94b9ca9fb4f0b6e13775f38295a73223f7f..f162ef504634f18130e03431a897d95a6e36ab60 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -1698,12 +1698,13 @@ void QuicStreamFactory::MaybeInitialize() {
     return;
 
   has_initialized_data_ = true;
-  for (const std::pair<const HostPortPair, AlternativeServiceInfoVector>&
+  for (const std::pair<const url::SchemeHostPort, AlternativeServiceInfoVector>&
            key_value : http_server_properties_->alternative_service_map()) {
+    HostPortPair host_port_pair(key_value.first.host(), key_value.first.port());

[Ryan Hamilton, 2016/04/18 17:18:40]

nit: move this down to where it's used (or perhaps just inline it into the
insert() call.

[Zhongyi Shi, 2016/04/18 19:26:37]

It's used multiple times in the inner for loop. I feel better to declare it
here. 

     for (const AlternativeServiceInfo& alternative_service_info :
          key_value.second) {
       if (alternative_service_info.alternative_service.protocol == QUIC) {
-        quic_supported_servers_at_startup_.insert(key_value.first);
+        quic_supported_servers_at_startup_.insert(host_port_pair);
         break;
       }
     }