mojo: java bindings rename Message subclasses.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.mojo.bindings;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.mojo.MojoTestCase;
 import org.chromium.mojo.bindings.BindingsTestUtils.CapturingErrorHandler;
@@ skipping 49 matching lines @@
         MessageHeader header = new MessageHeader(requestMessageType,
                 MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG, 0);
         Encoder encoder = new Encoder(CoreImpl.getInstance(), header.getSize());
         header.encode(encoder);
         mRouter.acceptWithResponder(encoder.getMessage(), mReceiver);
         ByteBuffer receiveBuffer = ByteBuffer.allocateDirect(header.getSize());
         MessagePipeHandle.ReadMessageResult result = mHandle.readMessage(receiveBuffer, 0,
                 MessagePipeHandle.ReadFlags.NONE);
 
         assertEquals(MojoResult.OK, result.getMojoResult());
-        MessageHeader receivedHeader = new SimpleMessage(
-                receiveBuffer, new ArrayList<Handle>()).asMojoMessage().getHeader();
+        MessageHeader receivedHeader = new Message(
+                receiveBuffer, new ArrayList<Handle>()).asServiceMessage().getHeader();
 
         assertEquals(header.getType(), receivedHeader.getType());
         assertEquals(header.getFlags(), receivedHeader.getFlags());
         assertTrue(receivedHeader.getRequestId() != 0);
 
         // Sending the response.
         MessageHeader responseHeader = new MessageHeader(responseMessageType,
                 MessageHeader.MESSAGE_IS_RESPONSE_FLAG, receivedHeader.getRequestId());
         encoder = new Encoder(CoreImpl.getInstance(), header.getSize());
         responseHeader.encode(encoder);
         Message responseMessage = encoder.getMessage();
         mHandle.writeMessage(responseMessage.getData(), new ArrayList<Handle>(),
                 MessagePipeHandle.WriteFlags.NONE);
         nativeRunLoop(RUN_LOOP_TIMEOUT_MS);
 
         assertEquals(1, mReceiver.messages.size());
-        MessageWithHeader receivedResponseMessage = mReceiver.messages.get(0).asMojoMessage();
+        ServiceMessage receivedResponseMessage = mReceiver.messages.get(0).asServiceMessage();
         assertEquals(MessageHeader.MESSAGE_IS_RESPONSE_FLAG,
                 receivedResponseMessage.getHeader().getFlags());
         assertEquals(responseMessage.getData(), receivedResponseMessage.getData());
     }
 
     /**
      * Testing receiving a message via the router that expected a response.
      */
     @SmallTest
     public void testReceivingViaRouterWithResponse() {
@@ skipping 24 matching lines @@
         Message message = encoder.getMessage();
         receivedMessage.second.accept(message);
         ByteBuffer receivedResponseMessage = ByteBuffer.allocateDirect(responseHeader.getSize());
         MessagePipeHandle.ReadMessageResult result = mHandle.readMessage(receivedResponseMessage, 0,
                 MessagePipeHandle.ReadFlags.NONE);
 
         assertEquals(MojoResult.OK, result.getMojoResult());
         assertEquals(message.getData(), receivedResponseMessage);
     }
 }