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

Unified Diff: net/socket/client_socket_pool_base.cc

Issue 7812036: Update base/timer.h code to pass through Location from call sites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
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 24966c05ec809cef02376f0812de6adc94969563..231562a1fe9b439e6bdbd02ab2966ab64db64511 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -90,7 +90,7 @@ void ConnectJob::Initialize(bool is_preconnect) {
int ConnectJob::Connect() {
if (timeout_duration_ != base::TimeDelta())
- timer_.Start(timeout_duration_, this, &ConnectJob::OnTimeout);
+ timer_.Start(timeout_duration_, this, &ConnectJob::OnTimeout, FROM_HERE);
idle_ = false;
@@ -131,7 +131,7 @@ void ConnectJob::NotifyDelegateOfCompletion(int rv) {
void ConnectJob::ResetTimer(base::TimeDelta remaining_time) {
timer_.Stop();
- timer_.Start(remaining_time, this, &ConnectJob::OnTimeout);
+ timer_.Start(remaining_time, this, &ConnectJob::OnTimeout, FROM_HERE);
}
void ConnectJob::LogConnectStart() {
@@ -698,7 +698,7 @@ void ClientSocketPoolBaseHelper::EnableConnectBackupJobs() {
void ClientSocketPoolBaseHelper::IncrementIdleCount() {
if (++idle_socket_count_ == 1)
timer_.Start(TimeDelta::FromSeconds(kCleanupInterval), this,
- &ClientSocketPoolBaseHelper::OnCleanupTimerFired);
+ &ClientSocketPoolBaseHelper::OnCleanupTimerFired, FROM_HERE);
}
void ClientSocketPoolBaseHelper::DecrementIdleCount() {

Powered by Google App Engine
This is Rietveld 408576698