summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipc/ipc_fuzzing_tests.cc8
-rw-r--r--ipc/ipc_logging.cc4
-rw-r--r--ipc/ipc_sync_channel_unittest.cc2
-rw-r--r--ipc/ipc_tests.cc4
4 files changed, 9 insertions, 9 deletions
diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc
index a45d725..05d177b 100644
--- a/ipc/ipc_fuzzing_tests.cc
+++ b/ipc/ipc_fuzzing_tests.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.
@@ -267,7 +267,7 @@ TEST_F(IPCFuzzingTest, SanityTest) {
&listener);
base::ProcessHandle server_process = SpawnChild(FUZZER_SERVER, &chan);
ASSERT_TRUE(server_process);
- base::PlatformThread::Sleep(1000);
+ base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
ASSERT_TRUE(chan.Connect());
listener.Init(&chan);
@@ -297,7 +297,7 @@ TEST_F(IPCFuzzingTest, MsgBadPayloadShort) {
&listener);
base::ProcessHandle server_process = SpawnChild(FUZZER_SERVER, &chan);
ASSERT_TRUE(server_process);
- base::PlatformThread::Sleep(1000);
+ base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
ASSERT_TRUE(chan.Connect());
listener.Init(&chan);
@@ -327,7 +327,7 @@ TEST_F(IPCFuzzingTest, MsgBadPayloadArgs) {
&listener);
base::ProcessHandle server_process = SpawnChild(FUZZER_SERVER, &chan);
ASSERT_TRUE(server_process);
- base::PlatformThread::Sleep(1000);
+ base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
ASSERT_TRUE(chan.Connect());
listener.Init(&chan);
diff --git a/ipc/ipc_logging.cc b/ipc/ipc_logging.cc
index 9f615bd..d50766c 100644
--- a/ipc/ipc_logging.cc
+++ b/ipc/ipc_logging.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.
@@ -233,7 +233,7 @@ void Logging::Log(const LogData& data) {
queue_invoke_later_pending_ = true;
MessageLoop::current()->PostDelayedTask(
FROM_HERE, base::Bind(&Logging::OnSendLogs, base::Unretained(this)),
- kLogSendDelayMs);
+ base::TimeDelta::FromMilliseconds(kLogSendDelayMs));
}
}
}
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index f396843..81ca560 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -1034,7 +1034,7 @@ namespace {
void NestedCallback(Worker* server) {
// Sleep a bit so that we wake up after the reply has been received.
- base::PlatformThread::Sleep(250);
+ base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(250));
server->SendAnswerToLife(true, base::kNoTimeout, true);
}
diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc
index 2727681..b6fd38b 100644
--- a/ipc/ipc_tests.cc
+++ b/ipc/ipc_tests.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.
@@ -501,7 +501,7 @@ TEST_F(IPCChannelTest, Performance) {
HANDLE process = SpawnChild(TEST_REFLECTOR, &chan);
ASSERT_TRUE(process);
- PlatformThread::Sleep(1000);
+ PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
PerfTimeLogger logger("IPC_Perf");