Change SupportsSpdy dict, SpdySettingsMap, ServerNetworkStatsMap, AlternativeServiceMap and disk da…

net/http/http_stream_factory_impl.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/http/http_stream_factory_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 166 matching lines @@
 
 AlternativeService HttpStreamFactoryImpl::GetAlternativeServiceFor(
     const HttpRequestInfo& request_info,
     HttpStreamRequest::Delegate* delegate,
     HttpStreamRequest::StreamType stream_type) {
   GURL original_url = request_info.url;
 
   if (original_url.SchemeIs("ftp"))
     return AlternativeService();
 
-  HostPortPair origin = HostPortPair::FromURL(original_url);
+  url::SchemeHostPort origin(original_url);
   HttpServerProperties& http_server_properties =
       *session_->http_server_properties();
   const AlternativeServiceVector alternative_service_vector =
       http_server_properties.GetAlternativeServices(origin);
   if (alternative_service_vector.empty())
     return AlternativeService();
 
   bool quic_advertised = false;
   bool quic_all_broken = true;
 
@@ skipping 59 matching lines @@
       continue;
 
     if (!original_url.SchemeIs("https"))
       continue;
 
     // Check whether there is an existing QUIC session to use for this origin.
     HostPortPair destination(alternative_service.host_port_pair());
     ignore_result(ApplyHostMappingRules(original_url, &destination));
     QuicServerId server_id(destination, request_info.privacy_mode);
 
-    HostPortPair origin_copy(origin);
+    HostPortPair origin_copy(origin.host(), origin.port());
     ignore_result(ApplyHostMappingRules(original_url, &origin_copy));
 
     if (session_->quic_stream_factory()->CanUseExistingSession(
             server_id, origin_copy.host())) {
       return alternative_service;
     }
 
     // Cache this entry if we don't have a non-broken Alt-Svc yet.
     if (first_alternative_service.protocol == UNINITIALIZED_ALTERNATE_PROTOCOL)
       first_alternative_service = alternative_service;
@@ skipping 85 matching lines @@
     return true;
 
   if (session_->params().transport_security_state->IsGooglePinnedHost(host))
     return true;
 
   return ContainsKey(session_->params().quic_host_whitelist,
                      base::ToLowerASCII(host));
 }
 
 }  // namespace net