Merge 21988 - Fix crash in client_socket_pool_base.cc....

net/socket/client_socket_pool_base.cc

 // Copyright (c) 2006-2008 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/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/time.h"
@@ skipping 128 matching lines @@
     ConnectJob* job = connect_job.release();
     if (g_late_binding) {
       CHECK(!ContainsKey(connect_job_map_, handle));
       InsertRequestIntoQueue(r, &group.pending_requests);
     } else {
       group.connecting_requests[handle] = r;
       CHECK(!ContainsKey(connect_job_map_, handle));
       connect_job_map_[handle] = job;
     }
     group.jobs.insert(job);
-  } else {
-    if (group.IsEmpty())
-      group_map_.erase(group_name);
+  } else if (group.IsEmpty()) {
+    group_map_.erase(group_name);
   }
 
   return rv;
 }
 
 void ClientSocketPoolBase::CancelRequest(const std::string& group_name,
                                          const ClientSocketHandle* handle) {
   CHECK(ContainsKey(group_map_, group_name));
 
   Group& group = group_map_[group_name];
@@ skipping 112 matching lines @@
         delete j->socket;
         j = group.idle_sockets.erase(j);
         DecrementIdleCount();
       } else {
         ++j;
       }
     }
 
     // Delete group if no longer needed.
     if (group.IsEmpty()) {
-      CHECK(group.pending_requests.empty());
       group_map_.erase(i++);
     } else {
       ++i;
     }
   }
 }
 
 void ClientSocketPoolBase::IncrementIdleCount() {
   if (++idle_socket_count_ == 1)
     timer_.Start(TimeDelta::FromSeconds(kCleanupInterval), this,
@@ skipping 219 matching lines @@
   IncrementIdleCount();
 }
 
 void ClientSocketPoolBase::CancelAllConnectJobs() {
   for (GroupMap::iterator i = group_map_.begin(); i != group_map_.end();) {
     Group& group = i->second;
     STLDeleteElements(&group.jobs);
 
     // Delete group if no longer needed.
     if (group.IsEmpty()) {
-      CHECK(group.pending_requests.empty());
       group_map_.erase(i++);
     } else {
       ++i;
     }
   }
 }
 
 bool ClientSocketPoolBase::ReachedMaxSocketsLimit() const {
   // Each connecting socket will eventually connect and be handed out.
   int total = handed_out_socket_count_ + connecting_socket_count_;
   DCHECK_LE(total, max_sockets_);
   return total == max_sockets_;
 }
 
 }  // namespace net