MessageReceiver must handle Message and not MessageWithHeader.

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

Index: mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTestUtils.java
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTestUtils.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTestUtils.java
index c9ffa028ba77786e091efccea9d0210c09c11987..bb0cd2bdae0f034ff62178914ee295419cbc2581 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTestUtils.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTestUtils.java
@@ -24,13 +24,13 @@ public class BindingsTestUtils {
     public static class RecordingMessageReceiver extends SideEffectFreeCloseable
             implements MessageReceiver {
 
-        public final List<MessageWithHeader> messages = new ArrayList<MessageWithHeader>();
+        public final List<Message> messages = new ArrayList<Message>();
 
         /**
-         * @see MessageReceiver#accept(MessageWithHeader)
+         * @see MessageReceiver#accept(Message)
          */
         @Override
-        public boolean accept(MessageWithHeader message) {
+        public boolean accept(Message message) {
             messages.add(message);
             return true;
         }
@@ -42,15 +42,14 @@ public class BindingsTestUtils {
     public static class RecordingMessageReceiverWithResponder extends RecordingMessageReceiver
             implements MessageReceiverWithResponder {
 
-        public final List<Pair<MessageWithHeader, MessageReceiver>> messagesWithReceivers =
-                new ArrayList<Pair<MessageWithHeader, MessageReceiver>>();
+        public final List<Pair<Message, MessageReceiver>> messagesWithReceivers =
+                new ArrayList<Pair<Message, MessageReceiver>>();
 
         /**
-         * @see MessageReceiverWithResponder#acceptWithResponder(MessageWithHeader,
-         *      MessageReceiver)
+         * @see MessageReceiverWithResponder#acceptWithResponder(Message, MessageReceiver)
          */
         @Override
-        public boolean acceptWithResponder(MessageWithHeader message, MessageReceiver responder) {
+        public boolean acceptWithResponder(Message message, MessageReceiver responder) {
             messagesWithReceivers.add(Pair.create(message, responder));
             return true;
         }
@@ -91,6 +90,6 @@ public class BindingsTestUtils {
             message.putInt(4 * i, headerAsInts[i]);
         }
         message.position(0);
-        return new MessageWithHeader(new Message(message, new ArrayList<Handle>()));
+        return new SimpleMessage(message, new ArrayList<Handle>()).asMojoMessage();
     }
 }