Change ClientSocketPoolManager::InitSocketHandleForHttpRequest and friends

net/http/http_stream_factory_impl_job.cc

Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 54e837914b04d3ac0c4622cb89b11a1902b39a1b..8fa3aa77af5e0311e07c1afe34d2ac3f146f08cd 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -870,7 +870,7 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
   if (IsPreconnecting()) {
     DCHECK(!stream_factory_->for_websockets_);
     return PreconnectSocketsForHttpRequest(
-        alternative_service_url_, request_info_.extra_headers,
+        GetSocketGroup(), server_, request_info_.extra_headers,
         request_info_.load_flags, priority_, session_, proxy_info_,
         ShouldForceSpdySSL(), want_spdy_over_npn, server_ssl_config_,
         proxy_ssl_config_, request_info_.privacy_mode, net_log_, num_streams_);
@@ -887,15 +887,15 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
     SSLConfig websocket_server_ssl_config = server_ssl_config_;
     websocket_server_ssl_config.next_protos.clear();
     return InitSocketHandleForWebSocketRequest(
-        origin_url_, request_info_.extra_headers, request_info_.load_flags,
-        priority_, session_, proxy_info_, ShouldForceSpdySSL(),
-        want_spdy_over_npn, websocket_server_ssl_config, proxy_ssl_config_,
-        request_info_.privacy_mode, net_log_,
+        GetSocketGroup(), server_, request_info_.extra_headers,
+        request_info_.load_flags, priority_, session_, proxy_info_,
+        ShouldForceSpdySSL(), want_spdy_over_npn, websocket_server_ssl_config,
+        proxy_ssl_config_, request_info_.privacy_mode, net_log_,
         connection_.get(), resolution_callback, io_callback_);
   }
 
   return InitSocketHandleForHttpRequest(
-      alternative_service_url_, request_info_.extra_headers,
+      GetSocketGroup(), server_, request_info_.extra_headers,
       request_info_.load_flags, priority_, session_, proxy_info_,
       ShouldForceSpdySSL(), want_spdy_over_npn, server_ssl_config_,
       proxy_ssl_config_, request_info_.privacy_mode, net_log_,
@@ -1490,4 +1490,14 @@ void HttpStreamFactoryImpl::Job::MaybeMarkAlternativeServiceBroken() {
   }
 }
 
+ClientSocketPoolManager::SocketGroupType
+HttpStreamFactoryImpl::Job::GetSocketGroup() {
+  if (IsAlternate() &&
+      alternative_service_.protocol >= NPN_SPDY_MINIMUM_VERSION &&
+      alternative_service_.protocol <= NPN_SPDY_MAXIMUM_VERSION) {
+    return ClientSocketPoolManager::SSL_GROUP;

[mmenke, 2015/04/07 16:36:58]

This is kinda weird.  In HttpStreamFactoryImpl::Job::DoStart, any alternate
service URL is rewritten as https, but here, only SPDY ones are changed.  Could
this entire method just be:

ClientSocketPoolManager::GroupTypeFromScheme(alternative_service_url_.scheme())?

(I know QUIC doesn't go through this method, but as-is, just seems a bit weird
and redundant)

[Ryan Hamilton, 2015/04/07 19:07:30]

Done. Good point. 

My slightly longer term objective is to remove alternative_service_url_
completely, so I think this method will end up looking like I have it now, but
your suggestion is a good one until then. Thanks.

+  }
+  return ClientSocketPoolManager::GroupTypeFromScheme(origin_url_.scheme());
+}
+
 }  // namespace net