Index: net/socket/client_socket_handle.cc |
=================================================================== |
--- net/socket/client_socket_handle.cc (revision 218769) |
+++ net/socket/client_socket_handle.cc (working copy) |
@@ -18,7 +18,7 @@ |
ClientSocketHandle::ClientSocketHandle() |
: is_initialized_(false), |
pool_(NULL), |
- layered_pool_(NULL), |
+ higher_pool_(NULL), |
is_reused_(false), |
callback_(base::Bind(&ClientSocketHandle::OnIOComplete, |
base::Unretained(this))), |
@@ -53,10 +53,8 @@ |
group_name_.clear(); |
is_reused_ = false; |
user_callback_.Reset(); |
- if (layered_pool_) { |
- pool_->RemoveLayeredPool(layered_pool_); |
- layered_pool_ = NULL; |
- } |
+ if (higher_pool_) |
+ RemoveHigherLayeredPool(higher_pool_); |
pool_ = NULL; |
idle_time_ = base::TimeDelta(); |
init_time_ = base::TimeTicks(); |
@@ -82,24 +80,27 @@ |
} |
bool ClientSocketHandle::IsPoolStalled() const { |
+ if (!pool_) |
+ return false; |
return pool_->IsStalled(); |
} |
-void ClientSocketHandle::AddLayeredPool(LayeredPool* layered_pool) { |
- CHECK(layered_pool); |
- CHECK(!layered_pool_); |
+void ClientSocketHandle::AddHigherLayeredPool(HigherLayeredPool* higher_pool) { |
+ CHECK(higher_pool); |
+ CHECK(!higher_pool_); |
if (pool_) { |
- pool_->AddLayeredPool(layered_pool); |
- layered_pool_ = layered_pool; |
+ pool_->AddHigherLayeredPool(higher_pool); |
+ higher_pool_ = higher_pool; |
} |
} |
-void ClientSocketHandle::RemoveLayeredPool(LayeredPool* layered_pool) { |
- CHECK(layered_pool); |
- CHECK(layered_pool_); |
+void ClientSocketHandle::RemoveHigherLayeredPool( |
+ HigherLayeredPool* higher_pool) { |
+ CHECK(higher_pool_); |
+ CHECK_EQ(higher_pool_, higher_pool); |
if (pool_) { |
- pool_->RemoveLayeredPool(layered_pool); |
- layered_pool_ = NULL; |
+ pool_->RemoveHigherLayeredPool(higher_pool); |
+ higher_pool_ = NULL; |
} |
} |