MessageReceiver must handle Message and not MessageWithHeader.

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 09871ca42cf1d2b0e2aa6f709b8af36569719880..d6e0489be51d2ffdcb79e037d6cfac6c37c1b380 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java
@@ -30,7 +30,7 @@ public class ConnectorTest extends MojoTestCase {
 
     private MessagePipeHandle mHandle;
     private Connector mConnector;
-    private MessageWithHeader mTestMessage;
+    private Message mTestMessage;
     private RecordingMessageReceiver mReceiver;
     private CapturingErrorHandler mErrorHandler;
 
@@ -77,7 +77,7 @@ public class ConnectorTest extends MojoTestCase {
                 MessagePipeHandle.ReadFlags.NONE);
         assertEquals(MojoResult.OK, result.getMojoResult());
         assertEquals(DATA_LENGTH, result.getMessageSize());
-        assertEquals(mTestMessage.getMessage().buffer, received);
+        assertEquals(mTestMessage.getData(), received);
     }
 
     /**
@@ -85,14 +85,14 @@ public class ConnectorTest extends MojoTestCase {
      */
     @SmallTest
     public void testReceivingMessage() {
-        mHandle.writeMessage(mTestMessage.getMessage().buffer, new ArrayList<Handle>(),
+        mHandle.writeMessage(mTestMessage.getData(), new ArrayList<Handle>(),
                 MessagePipeHandle.WriteFlags.NONE);
         nativeRunLoop(RUN_LOOP_TIMEOUT_MS);
         assertNull(mErrorHandler.getLastMojoException());
         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.getHandles().size());
+        assertEquals(mTestMessage.getData(), received.getData());
     }
 
     /**