diff options
author | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 04:41:40 +0000 |
---|---|---|
committer | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 04:41:40 +0000 |
commit | 5896fa04bfa1bef627d6d9bb101326668bc29bb4 (patch) | |
tree | cc751999e5e87e0ab250d015e4b121e67fc47c15 /ipc | |
parent | 1813439565ec0222546b3e2fbaaf5d67ba639bfd (diff) | |
download | chromium_src-5896fa04bfa1bef627d6d9bb101326668bc29bb4.zip chromium_src-5896fa04bfa1bef627d6d9bb101326668bc29bb4.tar.gz chromium_src-5896fa04bfa1bef627d6d9bb101326668bc29bb4.tar.bz2 |
Convert uses of int ms to TimeDelta in content/browser, ipc, and webkit/plugins.
R=jam@chromium.org
BUG=108171
Review URL: http://codereview.chromium.org/9572035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/ipc_channel_posix_unittest.cc | 7 | ||||
-rw-r--r-- | ipc/ipc_sync_channel.cc | 2 | ||||
-rw-r--r-- | ipc/ipc_sync_channel_unittest.cc | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc index e8856a9..b4ec401 100644 --- a/ipc/ipc_channel_posix_unittest.cc +++ b/ipc/ipc_channel_posix_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. @@ -177,7 +177,10 @@ void IPCChannelPosixTest::SpinRunLoop(int milliseconds) { // in the case of a bad test. Usually, the run loop will quit sooner than // that because all tests use a IPCChannelPosixTestListener which quits the // current run loop on any channel activity. - loop->PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), milliseconds); + loop->PostDelayedTask( + FROM_HERE, + MessageLoop::QuitClosure(), + base::TimeDelta::FromMilliseconds(milliseconds)); loop->Run(); } diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc index be8315c..b331779 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc @@ -445,7 +445,7 @@ bool SyncChannel::SendWithTimeout(Message* message, int timeout_ms) { context->ipc_message_loop()->PostDelayedTask( FROM_HERE, base::Bind(&SyncContext::OnSendTimeout, context.get(), message_id), - timeout_ms); + base::TimeDelta::FromMilliseconds(timeout_ms)); } // Wait for reply, or for any other incoming synchronous messages. diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index 81ca560..2b74ff4 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -1053,7 +1053,9 @@ class DoneEventRaceServer : public Worker { MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&NestedCallback, this)); MessageLoop::current()->PostDelayedTask( - FROM_HERE, base::Bind(&TimeoutCallback), 9000); + FROM_HERE, + base::Bind(&TimeoutCallback), + base::TimeDelta::FromSeconds(9)); // Even though we have a timeout on the Send, it will succeed since for this // bug, the reply message comes back and is deserialized, however the done // event wasn't set. So we indirectly use the timeout task to notice if a |