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

net/quic/quic_stream_factory.cc

 // 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.
 
 #include "net/quic/quic_stream_factory.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 1680 matching lines @@
 
 void QuicStreamFactory::MaybeInitialize() {
   // We don't initialize data from HttpServerProperties in the constructor
   // because HttpServerProperties has not yet initialized. We're guaranteed
   // HttpServerProperties has been initialized by the first time a request is
   // made.
   if (has_initialized_data_)
     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;
       }
     }
   }
 
   if (http_server_properties_->max_server_configs_stored_in_properties() == 0)
     return;
   // Create a temporary QuicServerInfo object to deserialize and to populate the
   // in-memory crypto server config cache in the MRU order.
   scoped_ptr<QuicServerInfo> server_info;
@@ skipping 52 matching lines @@
   // Since the session was active, there's no longer an
   // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP
   // job also fails. So to avoid not using QUIC when we otherwise could, we mark
   // it as recently broken, which means that 0-RTT will be disabled but we'll
   // still race.
   http_server_properties_->MarkAlternativeServiceRecentlyBroken(
       alternative_service);
 }
 
 }  // namespace net