Move SpdySessionRequestMap to SpdySessionPool

net/http/http_stream_factory_impl_job_controller.cc

 // Copyright (c) 2016 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_job_controller.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 430 matching lines @@
 
   // Cache these values in case the job gets deleted.
   const SSLConfig used_ssl_config = job->server_ssl_config();
   const ProxyInfo used_proxy_info = job->proxy_info();
   const bool was_alpn_negotiated = job->was_alpn_negotiated();
   const NextProto negotiated_protocol = job->negotiated_protocol();
   const bool using_spdy = job->using_spdy();
   const NetLogSource source_dependency = job->net_log().source();
 
   // Cache this so we can still use it if the JobController is deleted.
-  HttpStreamFactoryImpl* factory = factory_;
+  SpdySessionPool* spdy_session_pool = session_->spdy_session_pool();
 
   // Notify |request_|.
   if (!is_preconnect_ && !is_job_orphaned) {
     if (job->job_type() == MAIN && alternative_job_net_error_ != OK)
       ReportBrokenAlternativeService();
 
     DCHECK(request_);
 
     // The first case is the usual case.
     if (!job_bound_) {
@@ skipping 14 matching lines @@
           used_ssl_config, used_proxy_info,
           bidirectional_stream_impl.release());
     } else {
       std::unique_ptr<HttpStream> stream = job->ReleaseStream();
       DCHECK(stream);
       delegate_->OnStreamReady(used_ssl_config, used_proxy_info,
                                stream.release());
     }
   }
 
-  // Notify |factory_|. |request_| and |bounded_job_| might be deleted already.
+  // Notify other requests that has the same SpdySessionKey. |request_| and

[Bence, 2017/06/07 23:09:53]

s/has/have/ (since "requests" is plural)

[xunjieli, 2017/06/08 12:35:21]

Done.

+  // |bounded_job_| might be deleted already.
   if (spdy_session && spdy_session->IsAvailable()) {
-    factory->OnNewSpdySessionReady(spdy_session, direct, used_ssl_config,
-                                   used_proxy_info, was_alpn_negotiated,
-                                   negotiated_protocol, using_spdy,
-                                   source_dependency);
+    spdy_session_pool->OnNewSpdySessionReady(
+        spdy_session, direct, used_ssl_config, used_proxy_info,
+        was_alpn_negotiated, negotiated_protocol, using_spdy,
+        source_dependency);
   }
   if (is_job_orphaned) {
     OnOrphanedJobComplete(job);
   }
 }
 
 void HttpStreamFactoryImpl::JobController::OnPreconnectsComplete(Job* job) {
   DCHECK_EQ(main_job_.get(), job);
   main_job_.reset();
   factory_->OnPreconnectsCompleteInternal();
@@ skipping 94 matching lines @@
   ResumeMainJobLater(main_job_wait_time_);
   return true;
 }
 
 void HttpStreamFactoryImpl::JobController::SetSpdySessionKey(
     Job* job,
     const SpdySessionKey& spdy_session_key) {
   if (is_preconnect_ || IsJobOrphaned(job))
     return;
 
-  if (!request_->HasSpdySessionKey()) {
-    RequestSet& request_set =
-        factory_->spdy_session_request_map_[spdy_session_key];
-    DCHECK(!base::ContainsKey(request_set, request_));
-    request_set.insert(request_);
-    request_->SetSpdySessionKey(spdy_session_key);
-  }
+  session_->spdy_session_pool()->AddRequestToSpdySessionRequestMap(
+      spdy_session_key, request_);
 }
 
 void HttpStreamFactoryImpl::JobController::
     RemoveRequestFromSpdySessionRequestMapForJob(Job* job) {
   if (is_preconnect_ || IsJobOrphaned(job))
     return;
 
   RemoveRequestFromSpdySessionRequestMap();
 }
 
 void HttpStreamFactoryImpl::JobController::
     RemoveRequestFromSpdySessionRequestMap() {
-  if (request_->HasSpdySessionKey()) {
-    const SpdySessionKey& spdy_session_key = request_->GetSpdySessionKey();
-    SpdySessionRequestMap& spdy_session_request_map =
-        factory_->spdy_session_request_map_;
-    DCHECK(base::ContainsKey(spdy_session_request_map, spdy_session_key));
-    RequestSet& request_set = spdy_session_request_map[spdy_session_key];
-    DCHECK(base::ContainsKey(request_set, request_));
-    request_set.erase(request_);
-    if (request_set.empty())
-      spdy_session_request_map.erase(spdy_session_key);
-    request_->ResetSpdySessionKey();
-  }
+  // TODO(xunjieli): Use a DCHECK once https://crbug.com/718576 is fixed.
+  CHECK(request_);
+  session_->spdy_session_pool()->RemoveRequestFromSpdySessionRequestMap(
+      request_);
 }
 
 const NetLogWithSource* HttpStreamFactoryImpl::JobController::GetNetLog()
     const {
   return &net_log_;
 }
 
 void HttpStreamFactoryImpl::JobController::MaybeSetWaitTimeForMainJob(
     const base::TimeDelta& delay) {
   if (main_job_is_blocked_) {
@@ skipping 647 matching lines @@
     // If ReconsiderProxyAfterError() failed synchronously, it means
     // there was nothing left to fall-back to, so fail the transaction
     // with the last connection error we got.
     // TODO(eroman): This is a confusing contract, make it more obvious.
     rv = error;
   }
   return rv;
 }
 
 }  // namespace net