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

1 files changed, 6 insertions, 5 deletions

diff --git a/net/curvecp/messenger.cc b/net/curvecp/messenger.cc
index 703bc2e..ad6ed31 100644
--- a/net/curvecp/messenger.cc
+++ b/net/curvecp/messenger.cc
@@ -94,7 +94,8 @@ int Messenger::Write(IOBuffer* buf, int buf_len, CompletionCallback* callback) {
 
   int len = send_buffer_.write(buf->data(), buf_len);
   if (!send_timer_.IsRunning())
-    send_timer_.Start(base::TimeDelta(), this, &Messenger::OnSendTimer);
+    send_timer_.Start(FROM_HERE, base::TimeDelta(),
+                      this, &Messenger::OnSendTimer);
   if (len)
     return len;
 
@@ -183,7 +184,7 @@ void Messenger::OnSendMessageComplete(int result) {
     LOG(ERROR) << "RttTimeout is " << rtt_.rtt_timeout();
     base::TimeDelta delay =
         base::TimeDelta::FromMicroseconds(rtt_.rtt_timeout());
-    send_timeout_timer_.Start(delay, this, &Messenger::OnTimeout);
+    send_timeout_timer_.Start(FROM_HERE, delay, this, &Messenger::OnTimeout);
   }
 }
 
@@ -214,9 +215,9 @@ void Messenger::OnSendTimer() {
 
   // Set the next send timer.
   LOG(ERROR) << "SendRate is: " << rtt_.send_rate() << "us";
-  send_timer_.Start(base::TimeDelta::FromMicroseconds(rtt_.send_rate()),
-                    this,
-                    &Messenger::OnSendTimer);
+  send_timer_.Start(FROM_HERE,
+                    base::TimeDelta::FromMicroseconds(rtt_.send_rate()),
+                    this, &Messenger::OnSendTimer);
 
   // Create a block from the send_buffer.
   if (!sent_list_.is_full()) {