summaryrefslogtreecommitdiffstats
path: root/net/curvecp
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-04 07:32:33 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-04 07:32:33 +0000
commitbd493ca16f671a8ba7d2c92e11060cdcc8e10c92 (patch)
tree01260c0efd1e763c9f5eeda170e9d5b906c2d823 /net/curvecp
parent343b50e9fe289d4567df277332b54708d87f6e90 (diff)
downloadchromium_src-bd493ca16f671a8ba7d2c92e11060cdcc8e10c92.zip
chromium_src-bd493ca16f671a8ba7d2c92e11060cdcc8e10c92.tar.gz
chromium_src-bd493ca16f671a8ba7d2c92e11060cdcc8e10c92.tar.bz2
Revert 124890 - Convert uses of int ms to TimeDelta in chrome/browser and net.
R=jar@chromium.org BUG=108171 Review URL: http://codereview.chromium.org/9572036 TBR=tedvessenes@gmail.com Review URL: https://chromiumcodereview.appspot.com/9597005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/curvecp')
-rw-r--r--net/curvecp/client_packetizer.cc9
-rw-r--r--net/curvecp/client_packetizer.h4
2 files changed, 6 insertions, 7 deletions
diff --git a/net/curvecp/client_packetizer.cc b/net/curvecp/client_packetizer.cc
index 4b75c6e..9cafda2 100644
--- a/net/curvecp/client_packetizer.cc
+++ b/net/curvecp/client_packetizer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -235,8 +235,7 @@ int ClientPacketizer::DoSendingHelloComplete(int rv) {
int ClientPacketizer::DoWaitingCookie() {
next_state_ = WAITING_COOKIE_COMPLETE;
- StartHelloTimer(base::TimeDelta::FromMilliseconds(
- kHelloTimeoutMs[hello_attempts_++]));
+ StartHelloTimer(kHelloTimeoutMs[hello_attempts_++]);
read_buffer_ = new IOBuffer(kMaxPacketLength);
return socket_->Read(read_buffer_, kMaxPacketLength, io_callback_);
@@ -314,11 +313,11 @@ int ClientPacketizer::ConnectNextAddress() {
return rv;
}
-void ClientPacketizer::StartHelloTimer(base::TimeDelta delay) {
+void ClientPacketizer::StartHelloTimer(int milliseconds) {
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
base::Bind(&ClientPacketizer::OnHelloTimeout, weak_factory_.GetWeakPtr()),
- delay);
+ milliseconds);
}
void ClientPacketizer::RevokeHelloTimer() {
diff --git a/net/curvecp/client_packetizer.h b/net/curvecp/client_packetizer.h
index 5e83207..01869f4 100644
--- a/net/curvecp/client_packetizer.h
+++ b/net/curvecp/client_packetizer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -66,7 +66,7 @@ class ClientPacketizer : public Packetizer {
int ConnectNextAddress();
// We set a timeout for responses to the Hello message.
- void StartHelloTimer(base::TimeDelta delay);
+ void StartHelloTimer(int milliseconds);
void RevokeHelloTimer();
void OnHelloTimeout(); // Called when the Hello Timer fires.