summaryrefslogtreecommitdiffstats
path: root/net/curvecp
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 02:28:56 +0000
commit6fd550bdd8d9ad83330bed01efa25d801379e9f9 (patch)
tree6e8031e453ffeb9e192f1eafbf18ea8d4c54657c /net/curvecp
parentdd8d12a86e01b35b76f4add67cf5e222a475662b (diff)
downloadchromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.zip
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.gz
chromium_src-6fd550bdd8d9ad83330bed01efa25d801379e9f9.tar.bz2
Revert "Currently, base/timer.cc calls PostTask with FROM_HERE as the Location,
so the original code that created the delayed callback is lost." This reverts commit 4cf5cf73d319b69c32ad30af8954235755856455. (r99284) TBR=jbates@chromium.org Review URL: http://codereview.chromium.org/7825026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/curvecp')
-rw-r--r--net/curvecp/messenger.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/curvecp/messenger.cc b/net/curvecp/messenger.cc
index ad6ed31..703bc2e 100644
--- a/net/curvecp/messenger.cc
+++ b/net/curvecp/messenger.cc
@@ -94,8 +94,7 @@ 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(FROM_HERE, base::TimeDelta(),
- this, &Messenger::OnSendTimer);
+ send_timer_.Start(base::TimeDelta(), this, &Messenger::OnSendTimer);
if (len)
return len;
@@ -184,7 +183,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(FROM_HERE, delay, this, &Messenger::OnTimeout);
+ send_timeout_timer_.Start(delay, this, &Messenger::OnTimeout);
}
}
@@ -215,9 +214,9 @@ void Messenger::OnSendTimer() {
// Set the next send timer.
LOG(ERROR) << "SendRate is: " << rtt_.send_rate() << "us";
- send_timer_.Start(FROM_HERE,
- base::TimeDelta::FromMicroseconds(rtt_.send_rate()),
- this, &Messenger::OnSendTimer);
+ send_timer_.Start(base::TimeDelta::FromMicroseconds(rtt_.send_rate()),
+ this,
+ &Messenger::OnSendTimer);
// Create a block from the send_buffer.
if (!sent_list_.is_full()) {