Move SpdySessionRequestMap to SpdySessionPool

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 <tuple>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 22 matching lines @@
 namespace net {
 
 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session,
                                              bool for_websockets)
     : session_(session),
       job_factory_(new JobFactory()),
       for_websockets_(for_websockets),
       last_logged_job_controller_count_(0) {}
 
 HttpStreamFactoryImpl::~HttpStreamFactoryImpl() {
-  DCHECK(spdy_session_request_map_.empty());
   UMA_HISTOGRAM_COUNTS_1M("Net.JobControllerSet.CountOfJobControllerAtShutDown",
                           job_controller_set_.size());
 }
 
 std::unique_ptr<HttpStreamRequest> HttpStreamFactoryImpl::RequestStream(
     const HttpRequestInfo& request_info,
     RequestPriority priority,
     const SSLConfig& server_ssl_config,
     const SSLConfig& proxy_ssl_config,
     HttpStreamRequest::Delegate* delegate,
@@ skipping 94 matching lines @@
       proxy_ssl_config);
   JobController* job_controller_raw_ptr = job_controller.get();
   job_controller_set_.insert(std::move(job_controller));
   job_controller_raw_ptr->Preconnect(num_streams);
 }
 
 const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const {
   return &session_->params().host_mapping_rules;
 }
 
-void HttpStreamFactoryImpl::OnNewSpdySessionReady(
-    const base::WeakPtr<SpdySession>& spdy_session,
-    bool direct,
-    const SSLConfig& used_ssl_config,
-    const ProxyInfo& used_proxy_info,
-    bool was_alpn_negotiated,
-    NextProto negotiated_protocol,
-    bool using_spdy,
-    NetLogSource source_dependency) {
-  while (true) {
-    if (!spdy_session)
-      break;
-    const SpdySessionKey& spdy_session_key = spdy_session->spdy_session_key();
-    // Each iteration may empty out the RequestSet for |spdy_session_key| in
-    // |spdy_session_request_map_|. So each time, check for RequestSet and use
-    // the first one.
-    //
-    // TODO(willchan): If it's important, switch RequestSet out for a FIFO
-    // queue (Order by priority first, then FIFO within same priority). Unclear
-    // that it matters here.
-    if (!base::ContainsKey(spdy_session_request_map_, spdy_session_key))
-      break;
-    Request* request = *spdy_session_request_map_[spdy_session_key].begin();
-    request->Complete(was_alpn_negotiated, negotiated_protocol, using_spdy);
-    if (for_websockets_) {
-      // TODO(ricea): Restore this code path when WebSocket over SPDY
-      // implementation is ready.
-      NOTREACHED();
-    } else if (request->stream_type() ==
-               HttpStreamRequest::BIDIRECTIONAL_STREAM) {
-      request->OnBidirectionalStreamImplReady(
-          used_ssl_config, used_proxy_info,
-          new BidirectionalStreamSpdyImpl(spdy_session, source_dependency));
-    } else {
-      bool use_relative_url =
-          direct || request->url().SchemeIs(url::kHttpsScheme);
-      request->OnStreamReady(used_ssl_config, used_proxy_info,
-                             new SpdyHttpStream(spdy_session, use_relative_url,
-                                                source_dependency));
-    }
-  }
-  // TODO(mbelshe): Alert other valid requests.
-}
-
 void HttpStreamFactoryImpl::OnJobControllerComplete(JobController* controller) {
   for (auto it = job_controller_set_.begin(); it != job_controller_set_.end();
        ++it) {
     if (it->get() == controller) {
       job_controller_set_.erase(it);
       return;
     }
   }
   NOTREACHED();
 }
@@ skipping 173 matching lines @@
   factory_dump->AddScalar("main_job_count",
                           base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                           main_job_count);
   // The number of preconnect controllers.
   factory_dump->AddScalar("preconnect_count",
                           base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                           num_controllers_for_preconnect);
 }
 
 }  // namespace net