Fix crash in client_socket_pool_base.cc.
The CHECK that was being hit showed a real problem: group's IsEmpty
should take into account the pending requests queue too.
I also made IsEmpty check for connecting requests queue emptiness,
so we can be sure that IsEmpty really means empty.
TEST=Added a regression test ClientSocketPoolBaseTest.GroupWithPendingRequestsIsNotEmpty to net_unittests.
http://crbug.com/17985
Review URL: http://codereview.chromium.org/159597
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21988 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index d10cf60..db3858dc 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -146,9 +146,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;
@@ -281,7 +280,6 @@
// Delete group if no longer needed.
if (group.IsEmpty()) {
- CHECK(group.pending_requests.empty());
group_map_.erase(i++);
} else {
++i;
@@ -521,7 +519,6 @@
// Delete group if no longer needed.
if (group.IsEmpty()) {
- CHECK(group.pending_requests.empty());
group_map_.erase(i++);
} else {
++i;
