commit d323a176fa8c2ef474ce41dd8a1cddacb4fc67ff
author jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Sep 02 18:23:02 2011
committer jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Sep 02 18:23:02 2011
tree 5a6b91bcea70978cbf9b63000ed5f798d532f9b7
parent b1bb86d4d58f736fb980b8611ccf43d79e7b5b2b

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

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 24966c0..75fd528e 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -90,7 +90,7 @@
 
 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::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::IncrementIdleCount() {
   if (++idle_socket_count_ == 1)
-    timer_.Start(TimeDelta::FromSeconds(kCleanupInterval), this,
+    timer_.Start(FROM_HERE, TimeDelta::FromSeconds(kCleanupInterval), this,
                  &ClientSocketPoolBaseHelper::OnCleanupTimerFired);
 }