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

Unified Diff: third_party/mojo/src/mojo/edk/system/test_utils.h

Issue 975973002: Update mojo sdk to rev f68e697e389943cd9bf9652397312280e96b127a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: shake fist at msvc Created 5 years, 10 months 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: third_party/mojo/src/mojo/edk/system/test_utils.h
diff --git a/third_party/mojo/src/mojo/edk/system/test_utils.h b/third_party/mojo/src/mojo/edk/system/test_utils.h
index b16c5166daa9dca2c99e1795bae9dd49342ca51d..fba9c68cb8d794ba45471a42a6db006241ea335d 100644
--- a/third_party/mojo/src/mojo/edk/system/test_utils.h
+++ b/third_party/mojo/src/mojo/edk/system/test_utils.h
@@ -7,6 +7,7 @@
#include "base/macros.h"
#include "base/time/time.h"
+#include "mojo/public/c/system/types.h"
namespace mojo {
namespace system {
@@ -18,6 +19,14 @@ namespace test {
// as possible without causing too much flakiness.
base::TimeDelta EpsilonTimeout();
+// |TestTimeouts::tiny_timeout()|, as a |MojoDeadline|. (Expect this to be on
+// the order of 100 ms.)
+MojoDeadline TinyDeadline();
+
+// |TestTimeouts::action_timeout()|, as a |MojoDeadline|.(Expect this to be on
+// the order of 10 s.)
+MojoDeadline ActionDeadline();
+
// Stopwatch -------------------------------------------------------------------
// A simple "stopwatch" for measuring time elapsed from a given starting point.
« no previous file with comments | « third_party/mojo/src/mojo/edk/system/slave_connection_manager.h ('k') | third_party/mojo/src/mojo/edk/system/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698