Index: net/socket/client_socket_handle.cc |
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc |
index 8cc0e90cc4bfd6a8e7dab71296b75c2c854aa051..af3c78a18889c1cd5c4ceb9f73621854e8f0277f 100644 |
--- a/net/socket/client_socket_handle.cc |
+++ b/net/socket/client_socket_handle.cc |
@@ -17,6 +17,8 @@ namespace net { |
ClientSocketHandle::ClientSocketHandle() |
: is_initialized_(false), |
+ pool_(NULL), |
+ layered_pool_(NULL), |
is_reused_(false), |
ALLOW_THIS_IN_INITIALIZER_LIST(callback_( |
base::Bind(&ClientSocketHandle::OnIOComplete, |
@@ -52,6 +54,10 @@ void ClientSocketHandle::ResetInternal(bool cancel) { |
group_name_.clear(); |
is_reused_ = false; |
user_callback_.Reset(); |
+ if (layered_pool_) { |
+ pool_->RemoveLayeredPool(layered_pool_); |
+ layered_pool_ = NULL; |
+ } |
pool_ = NULL; |
idle_time_ = base::TimeDelta(); |
init_time_ = base::TimeTicks(); |
@@ -75,6 +81,19 @@ LoadState ClientSocketHandle::GetLoadState() const { |
return pool_->GetLoadState(group_name_, this); |
} |
+bool ClientSocketHandle::IsPoolStalled() const { |
+ return pool_->IsStalled(); |
+} |
+ |
+void ClientSocketHandle::AddLayeredPool(LayeredPool* layered_pool) { |
+ CHECK(layered_pool); |
+ CHECK(!layered_pool_); |
+ if (pool_) { |
+ pool_->AddLayeredPool(layered_pool); |
+ layered_pool_ = layered_pool; |
+ } |
+} |
+ |
void ClientSocketHandle::OnIOComplete(int result) { |
CompletionCallback callback = user_callback_; |
user_callback_.Reset(); |