This CL changes the lifespan of SSLConnectJobMessengers so that they are created only when needed,

net/socket/client_socket_pool_base.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/socket/client_socket_pool_base.h"
 
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
+#include "net/socket/ssl_client_socket_pool.h"
 
 using base::TimeDelta;
 
 namespace net {
 
 namespace {
 
 // Indicate whether we should enable idle socket cleanup timer. When timer is
 // disabled, sockets are closed next time a socket request is made.
 bool g_cleanup_timer_enabled = true;
@@ skipping 508 matching lines @@
       RemoveConnectJob(*group->jobs().begin(), group);
       CheckForStalledSocketGroups();
     }
   }
 }
 
 bool ClientSocketPoolBaseHelper::HasGroup(const std::string& group_name) const {
   return ContainsKey(group_map_, group_name);
 }
 
+void ClientSocketPoolBaseHelper::RemoveMessengersFromGroup(
+    const std::string& group_name,
+    const std::string& cache_key) const {
+  GroupMap::const_iterator it = group_map_.find(group_name);
+  if (it != group_map_.end())
+    it->second->RemoveMessengers(cache_key);
+}
+
 void ClientSocketPoolBaseHelper::CloseIdleSockets() {
   CleanupIdleSockets(true);
   DCHECK_EQ(0, idle_socket_count_);
 }
 
 int ClientSocketPoolBaseHelper::IdleSocketCountInGroup(
     const std::string& group_name) const {
   GroupMap::const_iterator i = group_map_.find(group_name);
   CHECK(i != group_map_.end());
 
@@ skipping 695 matching lines @@
   SanityCheck();
 
   // Delete active jobs.
   STLDeleteElements(&jobs_);
   unassigned_job_count_ = 0;
 
   // Stop backup job timer.
   backup_job_timer_.Stop();
 }
 
+void ClientSocketPoolBaseHelper::Group::RemoveMessengers(
+    const std::string& cache_key) {
+  for (std::set<ConnectJob*>::iterator it = jobs_.begin(); it != jobs_.end();
+       ++it) {
+    SSLConnectJob* job = static_cast<SSLConnectJob*>(*it);

[Ryan Sleevi, 2014/08/12 00:27:42]

This is definitely a layering violation

(It's a circular dependency - the base pool should not know about its children)

[mshelley, 2014/08/12 21:47:00]

Done.

+    job->RemoveMessenger(cache_key);
+  }
+}
+
 const ClientSocketPoolBaseHelper::Request*
 ClientSocketPoolBaseHelper::Group::GetNextPendingRequest() const {
   return
       pending_requests_.empty() ? NULL : pending_requests_.FirstMax().value();
 }
 
 bool ClientSocketPoolBaseHelper::Group::HasConnectJobForHandle(
     const ClientSocketHandle* handle) const {
   // Search the first |jobs_.size()| pending requests for |handle|.
   // If it's farther back in the deque than that, it doesn't have a
@@ skipping 51 matching lines @@
   pending_requests_.Erase(pointer);
   // If there are no more requests, kill the backup timer.
   if (pending_requests_.empty())
     backup_job_timer_.Stop();
   return request.Pass();
 }
 
 }  // namespace internal
 
 }  // namespace net