Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1120)

Unified Diff: mojo/edk/system/test_utils.cc

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/system/test_utils.cc
diff --git a/mojo/edk/system/test_utils.cc b/mojo/edk/system/test_utils.cc
index 3217c00956a486ba9e7b79d250b8e9431d8d6625..420b08480d547996a8e4529234c6927074294c47 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;

Powered by Google App Engine
This is Rietveld 408576698