Revert of Adding a router class to handle messages that expect responses.

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

Index: mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java
index ff5b464d6631634dec3a318860f9779357b4ebc3..21ac62489c3950204c0733311a81215933a5b42c 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java
@@ -7,6 +7,7 @@
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.mojo.MojoTestCase;
+import org.chromium.mojo.TestUtils;
 import org.chromium.mojo.bindings.BindingsTestUtils.CapturingErrorHandler;
 import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiver;
 import org.chromium.mojo.system.Core;
@@ -30,7 +31,7 @@
 
     private MessagePipeHandle mHandle;
     private Connector mConnector;
-    private MessageWithHeader mTestMessage;
+    private Message mTestMessage;
     private RecordingMessageReceiver mReceiver;
     private CapturingErrorHandler mErrorHandler;
 
@@ -50,7 +51,7 @@
         mErrorHandler = new CapturingErrorHandler();
         mConnector.setErrorHandler(mErrorHandler);
         mConnector.start();
-        mTestMessage = BindingsTestUtils.newRandomMessageWithHeader(DATA_LENGTH);
+        mTestMessage = new Message(TestUtils.newRandomBuffer(DATA_LENGTH), new ArrayList<Handle>());
         assertNull(mErrorHandler.exception);
         assertEquals(0, mReceiver.messages.size());
     }
@@ -77,7 +78,7 @@
                 MessagePipeHandle.ReadFlags.NONE);
         assertEquals(MojoResult.OK, result.getMojoResult());
         assertEquals(DATA_LENGTH, result.getMessageSize());
-        assertEquals(mTestMessage.getMessage().buffer, received);
+        assertEquals(mTestMessage.buffer, received);
     }
 
     /**
@@ -85,14 +86,14 @@
      */
     @SmallTest
     public void testReceivingMessage() {
-        mHandle.writeMessage(mTestMessage.getMessage().buffer, new ArrayList<Handle>(),
+        mHandle.writeMessage(mTestMessage.buffer, new ArrayList<Handle>(),
                 MessagePipeHandle.WriteFlags.NONE);
         nativeRunLoop(RUN_LOOP_TIMEOUT_MS);
         assertNull(mErrorHandler.exception);
         assertEquals(1, mReceiver.messages.size());
-        MessageWithHeader received = mReceiver.messages.get(0);
-        assertEquals(0, received.getMessage().handles.size());
-        assertEquals(mTestMessage.getMessage().buffer, received.getMessage().buffer);
+        Message received = mReceiver.messages.get(0);
+        assertEquals(0, received.handles.size());
+        assertEquals(mTestMessage.buffer, received.buffer);
     }
 
     /**