summaryrefslogtreecommitdiffstats
path: root/base/process_util_mac.mm
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 23:07:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 23:07:12 +0000
commit116dd0ac9189763c959932c1dd24f411d5ab80d6 (patch)
tree47d40d23b32a65955e20218174c35b50c99f79cc /base/process_util_mac.mm
parent1d43341ce3d90141fc9e118ae6b204d3893897e8 (diff)
downloadchromium_src-116dd0ac9189763c959932c1dd24f411d5ab80d6.zip
chromium_src-116dd0ac9189763c959932c1dd24f411d5ab80d6.tar.gz
chromium_src-116dd0ac9189763c959932c1dd24f411d5ab80d6.tar.bz2
GTTF: Replace usage of Time::Now with TimeTicks::Now
in cases where a clock change can really screw up things, e.g. shorten timeouts. BUG=none Review URL: https://codereview.chromium.org/11881004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_mac.mm')
-rw-r--r--base/process_util_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm
index cf1e7a8..8b8c14a 100644
--- a/base/process_util_mac.mm
+++ b/base/process_util_mac.mm
@@ -1207,14 +1207,14 @@ void WaitForChildToDie(pid_t child, int timeout) {
// Keep track of the elapsed time to be able to restart kevent if it's
// interrupted.
TimeDelta remaining_delta = TimeDelta::FromSeconds(timeout);
- Time deadline = Time::Now() + remaining_delta;
+ TimeTicks deadline = TimeTicks::Now() + remaining_delta;
result = -1;
struct kevent event = {0};
while (remaining_delta.InMilliseconds() > 0) {
const struct timespec remaining_timespec = remaining_delta.ToTimeSpec();
result = kevent(kq, NULL, 0, &event, 1, &remaining_timespec);
if (result == -1 && errno == EINTR) {
- remaining_delta = deadline - Time::Now();
+ remaining_delta = deadline - TimeTicks::Now();
result = 0;
} else {
break;