Extract Proxy Resolution out of HttpStreamFactoryImpl::Job

net/quic/chromium/quic_stream_factory.cc

Index: net/quic/chromium/quic_stream_factory.cc
diff --git a/net/quic/chromium/quic_stream_factory.cc b/net/quic/chromium/quic_stream_factory.cc
index 691d6fa45093b0928e0acaf5842b99e558244681..dd8f2ec91c7ab7dbda94453ddcc59773e779fd9d 100644
--- a/net/quic/chromium/quic_stream_factory.cc
+++ b/net/quic/chromium/quic_stream_factory.cc
@@ -623,7 +623,7 @@ base::TimeDelta QuicStreamRequest::GetTimeDelayForWaitingJob() const {
   return factory_->GetTimeDelayForWaitingJob(server_id_);
 }
 
-std::unique_ptr<QuicHttpStream> QuicStreamRequest::CreateStream() {
+std::unique_ptr<HttpStream> QuicStreamRequest::CreateStream() {
   if (!session_)
     return nullptr;
   return base::MakeUnique<QuicHttpStream>(session_, http_server_properties_);
@@ -636,6 +636,16 @@ QuicStreamRequest::CreateBidirectionalStreamImpl() {
   return base::MakeUnique<BidirectionalStreamQuicImpl>(session_);
 }
 
+QuicStreamRequestFactory::QuicStreamRequestFactory() {}
+
+QuicStreamRequestFactory::~QuicStreamRequestFactory() {}
+
+std::unique_ptr<QuicStreamRequest> QuicStreamRequestFactory::CreateRequest(
+    QuicStreamFactory* factory,
+    HttpServerProperties* http_server_properties) {
+  return base::MakeUnique<QuicStreamRequest>(factory, http_server_properties);
+}
+
 QuicStreamFactory::QuicStreamFactory(
     NetLog* net_log,
     HostResolver* host_resolver,
@@ -685,6 +695,7 @@ QuicStreamFactory::QuicStreamFactory(
       max_packet_length_(max_packet_length),
       clock_skew_detector_(base::TimeTicks::Now(), base::Time::Now()),
       socket_performance_watcher_factory_(socket_performance_watcher_factory),
+      stream_request_factory_(base::MakeUnique<QuicStreamRequestFactory>()),
       config_(InitializeQuicConfig(connection_options,
                                    idle_connection_timeout_seconds)),
       crypto_config_(base::WrapUnique(
@@ -850,6 +861,10 @@ bool QuicStreamFactory::CanUseExistingSession(const QuicServerId& server_id,
   return false;
 }
 
+std::unique_ptr<QuicStreamRequest> QuicStreamFactory::CreateStreamRequest() {
+  return stream_request_factory_->CreateRequest(this, http_server_properties_);
+}
+
 int QuicStreamFactory::Create(const QuicServerId& server_id,
                               const HostPortPair& destination,
                               int cert_verify_flags,