Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: net/socket/client_socket_pool_base.cc

Issue 176024: Make GetLoadState virtual in ConnectJob(). (Closed)
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/client_socket_pool_base.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_base.cc
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index 533d103df50c2216cbac953777f82b284e6e4f9f..d11be8a1edbf6e5eff9ac136eccc40661562c768 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -40,7 +40,6 @@ ConnectJob::ConnectJob(const std::string& group_name,
key_handle_(key_handle),
timeout_duration_(timeout_duration),
delegate_(delegate),
- load_state_(LOAD_STATE_IDLE),
load_log_(load_log) {
DCHECK(!group_name.empty());
DCHECK(key_handle);
@@ -313,7 +312,7 @@ LoadState ClientSocketPoolBaseHelper::GetLoadState(
NOTREACHED();
return LOAD_STATE_IDLE;
}
- return job_it->second->load_state();
+ return job_it->second->GetLoadState();
}
// Search pending_requests for matching handle.
@@ -324,7 +323,7 @@ LoadState ClientSocketPoolBaseHelper::GetLoadState(
LoadState max_state = LOAD_STATE_IDLE;
for (ConnectJobSet::const_iterator job_it = group.jobs.begin();
job_it != group.jobs.end(); ++job_it) {
- max_state = std::max(max_state, (*job_it)->load_state());
+ max_state = std::max(max_state, (*job_it)->GetLoadState());
}
return max_state;
} else {
« no previous file with comments | « net/socket/client_socket_pool_base.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698