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

net/socket/client_socket_pool_base.h

Index: net/socket/client_socket_pool_base.h
===================================================================
--- net/socket/client_socket_pool_base.h	(revision 22810)
+++ net/socket/client_socket_pool_base.h	(working copy)
@@ -196,7 +196,8 @@
     Group() : active_socket_count(0) {}
 
     bool IsEmpty() const {
-      return active_socket_count == 0 && idle_sockets.empty() && jobs.empty();
+      return active_socket_count == 0 && idle_sockets.empty() && jobs.empty() &&
+          pending_requests.empty() && connecting_requests.empty();
     }
 
     bool HasAvailableSocketSlot(int max_sockets_per_group) const {
Property changes on: net\socket\client_socket_pool_base.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/net/socket/client_socket_pool_base.h:r21988