diff options
| author | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 15:41:43 +0000 |
|---|---|---|
| committer | tedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 15:41:43 +0000 |
| commit | 0f2e45ec2650ebd32037ca109f1876ed85ce1fd5 (patch) | |
| tree | 0e289579bccf4d39273e60010eeed8699fa00bd8 /net/test | |
| parent | b80ffe2725c3d5ca17d21e3743c06689bca46935 (diff) | |
| download | chromium_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 'net/test')
| -rw-r--r-- | net/test/local_test_server.cc | 2 | ||||
| -rw-r--r-- | net/test/local_test_server_posix.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/test/local_test_server.cc b/net/test/local_test_server.cc index 7fe3e58..e67d4f9 100644 --- a/net/test/local_test_server.cc +++ b/net/test/local_test_server.cc @@ -122,7 +122,7 @@ bool LocalTestServer::Stop() { return true; // First check if the process has already terminated. - bool ret = base::WaitForSingleProcess(process_handle_, 0); + bool ret = base::WaitForSingleProcess(process_handle_, base::TimeDelta()); if (!ret) ret = base::KillProcess(process_handle_, 1, true); diff --git a/net/test/local_test_server_posix.cc b/net/test/local_test_server_posix.cc index 3756b69..3e47a0f 100644 --- a/net/test/local_test_server_posix.cc +++ b/net/test/local_test_server_posix.cc @@ -141,8 +141,7 @@ bool LocalTestServer::LaunchPython(const FilePath& testserver_path) { bool LocalTestServer::WaitToStart() { file_util::ScopedFD child_fd_closer(child_fd_closer_.release()); - base::TimeDelta remaining_time = base::TimeDelta::FromMilliseconds( - TestTimeouts::action_timeout_ms()); + base::TimeDelta remaining_time = TestTimeouts::action_timeout(); uint32 server_data_len = 0; if (!ReadData(child_fd_, sizeof(server_data_len), |