summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_send_fds_test.cc
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 15:41:43 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 15:41:43 +0000
commit0f2e45ec2650ebd32037ca109f1876ed85ce1fd5 (patch)
tree0e289579bccf4d39273e60010eeed8699fa00bd8 /ipc/ipc_send_fds_test.cc
parentb80ffe2725c3d5ca17d21e3743c06689bca46935 (diff)
downloadchromium_src-0f2e45ec2650ebd32037ca109f1876ed85ce1fd5.zip
chromium_src-0f2e45ec2650ebd32037ca109f1876ed85ce1fd5.tar.gz
chromium_src-0f2e45ec2650ebd32037ca109f1876ed85ce1fd5.tar.bz2
Switch to TimeDelta interfaces for process waiting functions in net and ipc.
R=agl@chromium.org BUG=108171 Review URL: https://chromiumcodereview.appspot.com/10692155 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_send_fds_test.cc')
-rw-r--r--ipc/ipc_send_fds_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc
index 05d9ae4..47c6dd1 100644
--- a/ipc/ipc_send_fds_test.cc
+++ b/ipc/ipc_send_fds_test.cc
@@ -106,7 +106,8 @@ void TestDescriptorServer(IPC::Channel &chan,
chan.Close();
// Cleanup child process.
- EXPECT_TRUE(base::WaitForSingleProcess(process_handle, 5000));
+ EXPECT_TRUE(base::WaitForSingleProcess(
+ process_handle, base::TimeDelta::FromSeconds(5)));
}
int TestDescriptorClient(ino_t expected_inode_num) {