| Index: mojo/edk/system/test_utils.cc
|
| diff --git a/mojo/edk/system/test_utils.cc b/mojo/edk/system/test_utils.cc
|
| index 5d78b15522b45923c2669a41e12eadcc0662b547..e25adc9a06713c6f130ac08d638eb0103a5cad7e 100644
|
| --- a/mojo/edk/system/test_utils.cc
|
| +++ b/mojo/edk/system/test_utils.cc
|
| @@ -23,15 +23,11 @@ MojoDeadline DeadlineFromMilliseconds(unsigned milliseconds) {
|
| }
|
|
|
| MojoDeadline EpsilonDeadline() {
|
| -// Originally, our epsilon timeout was 10 ms, which was mostly fine but flaky on
|
| -// some Windows bots. I don't recall ever seeing flakes on other bots. At 30 ms
|
| -// tests seem reliable on Windows bots, but not at 25 ms. We'd like this timeout
|
| -// to be as small as possible (see the description in the .h file).
|
| -//
|
| // 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) || defined(OS_ANDROID)
|
| +// etc.). Based on this, set it to (usually be) 30 ms on Android and 20 ms
|
| +// elsewhere. (We'd like this to be as small as possible, without making things
|
| +// flaky)
|
| +#if defined(OS_ANDROID)
|
| return (TinyDeadline() * 3) / 10;
|
| #else
|
| return (TinyDeadline() * 2) / 10;
|
|
|