Gather trace data by waiting on handles with a fixed timeout

mojo/public/cpp/bindings/lib/router.h

Index: mojo/public/cpp/bindings/lib/router.h
diff --git a/mojo/public/cpp/bindings/lib/router.h b/mojo/public/cpp/bindings/lib/router.h
index 86b889796bcbfcad3c6b09aaf40956eb1f648ec9..cc67b3b8a9cbe8cbb5b3670fd85596316514fba2 100644
--- a/mojo/public/cpp/bindings/lib/router.h
+++ b/mojo/public/cpp/bindings/lib/router.h
@@ -52,9 +52,11 @@ class Router : public MessageReceiverWithResponder {
   bool AcceptWithResponder(Message* message,
                            MessageReceiver* responder) override;
 
-  // Blocks the current thread for the first incoming method call, i.e., either
-  // a call to a client method or a callback method.
-  bool WaitForIncomingMessage() { return connector_.WaitForIncomingMessage(); }
+  // Blocks the current thread until the first incoming method call, i.e.,
+  // either a call to a client method or a callback method, or |deadline|.
+  bool WaitForIncomingMessage(MojoDeadline deadline) {
+    return connector_.WaitForIncomingMessage(deadline);
+  }
 
   // Sets this object to testing mode.
   // In testing mode:
@@ -63,6 +65,8 @@ class Router : public MessageReceiverWithResponder {
   //   receiver.
   void EnableTestingMode();
 
+  MessagePipeHandle handle() const { return connector_.handle(); }
+
  private:
   typedef std::map<uint64_t, MessageReceiver*> ResponderMap;