summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/pseudotcp_adapter_unittest.cc4
-rw-r--r--jingle/glue/thread_wrapper_unittest.cc12
2 files changed, 9 insertions, 7 deletions
diff --git a/jingle/glue/pseudotcp_adapter_unittest.cc b/jingle/glue/pseudotcp_adapter_unittest.cc
index 84d3b56..fd070e6 100644
--- a/jingle/glue/pseudotcp_adapter_unittest.cc
+++ b/jingle/glue/pseudotcp_adapter_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -141,7 +141,7 @@ class FakeSocket : public net::Socket {
base::Bind(&FakeSocket::AppendInputPacket,
base::Unretained(peer_socket_),
std::vector<char>(buf->data(), buf->data() + buf_len)),
- latency_ms_);
+ base::TimeDelta::FromMilliseconds(latency_ms_));
}
return buf_len;
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc
index 2fef6d3..41df41c 100644
--- a/jingle/glue/thread_wrapper_unittest.cc
+++ b/jingle/glue/thread_wrapper_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -147,8 +147,9 @@ TEST_F(ThreadWrapperTest, PostDelayed) {
MatchMessage(&handler2_, kTestMessage1, data4)))
.WillOnce(DeleteMessageData());
- message_loop_.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(),
- kMaxTestDelay);
+ message_loop_.PostDelayedTask(
+ FROM_HERE, MessageLoop::QuitClosure(),
+ base::TimeDelta::FromMilliseconds(kMaxTestDelay));
message_loop_.Run();
}
@@ -197,8 +198,9 @@ TEST_F(ThreadWrapperTest, ClearDelayed) {
MatchMessage(&handler2_, kTestMessage1, null_data)))
.WillOnce(DeleteMessageData());
- message_loop_.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(),
- kMaxTestDelay);
+ message_loop_.PostDelayedTask(
+ FROM_HERE, MessageLoop::QuitClosure(),
+ base::TimeDelta::FromMilliseconds(kMaxTestDelay));
message_loop_.Run();
}