Refactor: change the spdy session pool key to take a ProxyServer instead of a stri...

net/http/http_stream_request.cc

 // Copyright (c) 2010 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_request.h"
 
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "net/base/connection_type_histograms.h"
@@ skipping 405 matching lines @@
   bool want_spdy_over_npn =
       alternate_protocol_mode_ == kUsingAlternateProtocol &&
       alternate_protocol_ == HttpAlternateProtocols::NPN_SPDY_2;
   using_ssl_ = request_info().url.SchemeIs("https") ||
       (force_spdy_always_ && force_spdy_over_ssl_) ||
       want_spdy_over_npn;
   using_spdy_ = false;
 
   // Check first if we have a spdy session for this group.  If so, then go
   // straight to using that.
-  HostPortProxyPair pair(endpoint_, proxy_info()->proxy_server().ToPacString());
+  HostPortProxyPair pair(endpoint_, proxy_info()->proxy_server());
   if (session_->spdy_session_pool()->HasSession(pair)) {
     using_spdy_ = true;
     next_state_ = STATE_INIT_STREAM;
     return OK;
   }
 
   // Build the string used to uniquely identify connections of this type.
   // Determine the host and port to connect to.
   std::string connection_group = endpoint_.ToString();
   DCHECK(!connection_group.empty());
@@ skipping 240 matching lines @@
     stream_.reset(new HttpStreamHandle(connection_.release(), stream));
     return stream_->InitializeStream(&request_info(), net_log_, &io_callback_);
   }
 
   CHECK(!stream_.get());
 
   const scoped_refptr<SpdySessionPool> spdy_pool =
       session_->spdy_session_pool();
   scoped_refptr<SpdySession> spdy_session;
 
-  HostPortProxyPair pair(endpoint_,
-                         proxy_info()->proxy_server().ToPacString());
+  HostPortProxyPair pair(endpoint_, proxy_info()->proxy_server());
   if (session_->spdy_session_pool()->HasSession(pair)) {
     spdy_session =
         session_->spdy_session_pool()->Get(pair, session_, net_log_);
   } else {
     // SPDY can be negotiated using the TLS next protocol negotiation (NPN)
     // extension, or just directly using SSL. Either way, |connection_| must
     // contain an SSLClientSocket.
     CHECK(connection_->socket());
     int error = spdy_pool->GetSpdySessionFromSocket(
         pair, session_, connection_.release(), net_log_,
@@ skipping 211 matching lines @@
                                  100);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace net