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

net/socket/client_socket_pool_base.cc

Index: net/socket/client_socket_pool_base.cc
===================================================================
--- net/socket/client_socket_pool_base.cc	(revision 22810)
+++ net/socket/client_socket_pool_base.cc	(working copy)
@@ -130,9 +130,8 @@
       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;
@@ -265,7 +264,6 @@
 
     // Delete group if no longer needed.
     if (group.IsEmpty()) {
-      CHECK(group.pending_requests.empty());
       group_map_.erase(i++);
     } else {
       ++i;
@@ -457,7 +455,6 @@
 
     // Delete group if no longer needed.
     if (group.IsEmpty()) {
-      CHECK(group.pending_requests.empty());
       group_map_.erase(i++);
     } else {
       ++i;
Property changes on: net\socket\client_socket_pool_base.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/net/socket/client_socket_pool_base.cc:r21988