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..7458f7fc71e2dc20a73fd18f08e0dbbb0c3929de 100644
--- a/mojo/public/cpp/bindings/lib/router.h
+++ b/mojo/public/cpp/bindings/lib/router.h
@@ -54,7 +54,9 @@ class Router : public MessageReceiverWithResponder {
 
   // Blocks the current thread for the first incoming method call, i.e., either

[viettrungluu, 2015/04/02 19:54:13]

nit: update comment?

   // a call to a client method or a callback method.
-  bool WaitForIncomingMessage() { return connector_.WaitForIncomingMessage(); }
+  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;