Adding a router class to handle messages that expect responses.

mojo/android/javatests/src/org/chromium/mojo/bindings/MessageWithHeaderTest.java

Index: mojo/android/javatests/src/org/chromium/mojo/bindings/MessageWithHeaderTest.java
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/MessageTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/MessageWithHeaderTest.java
similarity index 72%
rename from mojo/android/javatests/src/org/chromium/mojo/bindings/MessageTest.java
rename to mojo/android/javatests/src/org/chromium/mojo/bindings/MessageWithHeaderTest.java
index 9f518f551f6084df8e63358ea0dd2fbe1fe8772a..ef5e8d5e4bce54365e1038d0e58c2afafc93062e 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/MessageTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/MessageWithHeaderTest.java
@@ -7,7 +7,6 @@ package org.chromium.mojo.bindings;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.mojo.MojoTestCase;
-import org.chromium.mojo.TestUtils;
 import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiver;
 import org.chromium.mojo.system.Core;
 import org.chromium.mojo.system.DataPipe;
@@ -24,9 +23,9 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * Testing {@link Message}.
+ * Testing {@link MessageWithHeader}.
  */
-public class MessageTest extends MojoTestCase {
+public class MessageWithHeaderTest extends MojoTestCase {
 
     private static final int DATA_SIZE = 1024;
 
@@ -43,7 +42,7 @@ public class MessageTest extends MojoTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         Core core = CoreImpl.getInstance();
-        mData = TestUtils.newRandomBuffer(DATA_SIZE);
+        mData = BindingsTestUtils.newRandomMessageWithHeader(DATA_SIZE).getMessage().buffer;
         mMessageReceiver = new RecordingMessageReceiver();
         mHandles = core.createMessagePipe();
         Pair<DataPipe.ProducerHandle, DataPipe.ConsumerHandle> datapipe = core.createDataPipe(null);
@@ -64,43 +63,43 @@ public class MessageTest extends MojoTestCase {
     }
 
     /**
-     * Testing {@link Message#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)}
+     * Testing {@link MessageWithHeader#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)}
      */
     @SmallTest
     public void testReadAndDispatchMessage() {
         mHandles.first.writeMessage(mData, mHandlesToSend, MessagePipeHandle.WriteFlags.NONE);
         assertEquals(MojoResult.OK,
-                Message.readAndDispatchMessage(mHandles.second, mMessageReceiver));
+                MessageWithHeader.readAndDispatchMessage(mHandles.second, mMessageReceiver));
         assertEquals(1, mMessageReceiver.messages.size());
-        Message message = mMessageReceiver.messages.get(0);
-        mHandlesToClose.addAll(message.handles);
-        assertEquals(mData, message.buffer);
-        assertEquals(2, message.handles.size());
-        for (Handle handle : message.handles) {
+        MessageWithHeader message = mMessageReceiver.messages.get(0);
+        mHandlesToClose.addAll(message.getMessage().handles);
+        assertEquals(mData, message.getMessage().buffer);
+        assertEquals(2, message.getMessage().handles.size());
+        for (Handle handle : message.getMessage().handles) {
             assertTrue(handle.isValid());
         }
     }
 
     /**
-     * Testing {@link Message#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)} with no
-     * message available.
+     * Testing {@link MessageWithHeader#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)}
+     * with no message available.
      */
     @SmallTest
     public void testReadAndDispatchMessageOnEmptyHandle() {
         assertEquals(MojoResult.SHOULD_WAIT,
-                Message.readAndDispatchMessage(mHandles.second, mMessageReceiver));
+                MessageWithHeader.readAndDispatchMessage(mHandles.second, mMessageReceiver));
         assertEquals(0, mMessageReceiver.messages.size());
     }
 
     /**
-     * Testing {@link Message#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)} on closed
-     * handle.
+     * Testing {@link MessageWithHeader#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)}
+     * on closed handle.
      */
     @SmallTest
     public void testReadAndDispatchMessageOnClosedHandle() {
         mHandles.first.close();
         try {
-            Message.readAndDispatchMessage(mHandles.second, mMessageReceiver);
+            MessageWithHeader.readAndDispatchMessage(mHandles.second, mMessageReceiver);
             fail("MojoException should have been thrown");
         } catch (MojoException expected) {
             assertEquals(MojoResult.FAILED_PRECONDITION, expected.getMojoResult());