Gather trace data by waiting on handles with a fixed timeout

mojo/public/cpp/bindings/lib/connector.cc

Index: mojo/public/cpp/bindings/lib/connector.cc
diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc
index 4f965ee2a448e50c6028382ba1300d50c11368d9..ebdcf38bdc3d7d248bac90c0cad4fe1f14e90554 100644
--- a/mojo/public/cpp/bindings/lib/connector.cc
+++ b/mojo/public/cpp/bindings/lib/connector.cc
@@ -45,14 +45,14 @@ ScopedMessagePipeHandle Connector::PassMessagePipe() {
   return message_pipe_.Pass();
 }
 
-bool Connector::WaitForIncomingMessage() {
+bool Connector::WaitForIncomingMessage(MojoDeadline deadline) {
   if (error_)
     return false;
 
-  MojoResult rv = Wait(message_pipe_.get(),
-                       MOJO_HANDLE_SIGNAL_READABLE,
-                       MOJO_DEADLINE_INDEFINITE,
-                       nullptr);
+  MojoResult rv =
+      Wait(message_pipe_.get(), MOJO_HANDLE_SIGNAL_READABLE, deadline, nullptr);
+  if (rv == MOJO_RESULT_SHOULD_WAIT)
+    return false;
   if (rv != MOJO_RESULT_OK) {
     NotifyError();
     return false;