summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_pool_base.cc
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 18:23:02 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 18:23:02 +0000
commitd323a176fa8c2ef474ce41dd8a1cddacb4fc67ff (patch)
tree5a6b91bcea70978cbf9b63000ed5f798d532f9b7 /net/socket/client_socket_pool_base.cc
parentb1bb86d4d58f736fb980b8611ccf43d79e7b5b2b (diff)
downloadchromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.zip
chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.gz
chromium_src-d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff.tar.bz2
Update base/timer.h code to pass through Location from call sites. (reland) original CL w/LGTMs: http://codereview.chromium.org/7812036/
Review URL: http://codereview.chromium.org/7824041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base.cc')
-rw-r--r--net/socket/client_socket_pool_base.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index 24966c0..75fd528 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(FROM_HERE, timeout_duration_, this, &ConnectJob::OnTimeout);
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(FROM_HERE, remaining_time, this, &ConnectJob::OnTimeout);
}
void ConnectJob::LogConnectStart() {
@@ -697,7 +697,7 @@ void ClientSocketPoolBaseHelper::EnableConnectBackupJobs() {
void ClientSocketPoolBaseHelper::IncrementIdleCount() {
if (++idle_socket_count_ == 1)
- timer_.Start(TimeDelta::FromSeconds(kCleanupInterval), this,
+ timer_.Start(FROM_HERE, TimeDelta::FromSeconds(kCleanupInterval), this,
&ClientSocketPoolBaseHelper::OnCleanupTimerFired);
}