diff options
| author | rockot <rockot@chromium.org> | 2014-12-08 22:41:37 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-09 06:42:04 +0000 |
| commit | fa648a32329c36eda94aeadac4aac14f3b8013be (patch) | |
| tree | 29386b2d867a4bb482368a57b90ba809b4079c22 /mojo/edk/system/test_utils.cc | |
| parent | bf9d1f3cc8c6921e60de38d8c1a51dee74edcd76 (diff) | |
| download | chromium_src-fa648a32329c36eda94aeadac4aac14f3b8013be.zip chromium_src-fa648a32329c36eda94aeadac4aac14f3b8013be.tar.gz chromium_src-fa648a32329c36eda94aeadac4aac14f3b8013be.tar.bz2 | |
Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2
BUG=None
TBR=digit@chromium.org for ashmem dep
TBR=darin@chromium.org for toplevel
Review URL: https://codereview.chromium.org/782693004
Cr-Commit-Position: refs/heads/master@{#307427}
Diffstat (limited to 'mojo/edk/system/test_utils.cc')
| -rw-r--r-- | mojo/edk/system/test_utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/edk/system/test_utils.cc b/mojo/edk/system/test_utils.cc index 3217c00..420b084 100644 --- a/mojo/edk/system/test_utils.cc +++ b/mojo/edk/system/test_utils.cc @@ -42,7 +42,7 @@ base::TimeDelta EpsilonTimeout() { // Currently, |tiny_timeout()| is usually 100 ms (possibly scaled under ASAN, // etc.). Based on this, set it to (usually be) 30 ms on Windows and 20 ms // elsewhere. -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_ANDROID) return (TestTimeouts::tiny_timeout() * 3) / 10; #else return (TestTimeouts::tiny_timeout() * 2) / 10; |