Index: mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java |
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java |
index f28b2ab5cde1e7f7678e1bd349eb39ea9d8dcd2c..f976e590da3f803dbcf1b24d70bf1b3ba6417640 100644 |
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java |
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java |
@@ -14,6 +14,7 @@ import org.chromium.mojo.system.Handle; |
import org.chromium.mojo.system.MessagePipeHandle; |
import org.chromium.mojo.system.MojoResult; |
import org.chromium.mojo.system.Pair; |
+import org.chromium.mojo.system.ResultAnd; |
import org.chromium.mojo.system.impl.CoreImpl; |
import java.nio.ByteBuffer; |
@@ -61,8 +62,8 @@ public class RouterTest extends MojoTestCase { |
header.encode(encoder); |
mRouter.acceptWithResponder(encoder.getMessage(), mReceiver); |
ByteBuffer receiveBuffer = ByteBuffer.allocateDirect(header.getSize()); |
- MessagePipeHandle.ReadMessageResult result = mHandle.readMessage(receiveBuffer, 0, |
- MessagePipeHandle.ReadFlags.NONE); |
+ ResultAnd<MessagePipeHandle.ReadMessageResult> result = |
+ mHandle.readMessage(receiveBuffer, 0, MessagePipeHandle.ReadFlags.NONE); |
assertEquals(MojoResult.OK, result.getMojoResult()); |
MessageHeader receivedHeader = new Message( |
@@ -121,8 +122,8 @@ public class RouterTest extends MojoTestCase { |
Message message = encoder.getMessage(); |
receivedMessage.second.accept(message); |
ByteBuffer receivedResponseMessage = ByteBuffer.allocateDirect(responseHeader.getSize()); |
- MessagePipeHandle.ReadMessageResult result = mHandle.readMessage(receivedResponseMessage, 0, |
- MessagePipeHandle.ReadFlags.NONE); |
+ ResultAnd<MessagePipeHandle.ReadMessageResult> result = |
+ mHandle.readMessage(receivedResponseMessage, 0, MessagePipeHandle.ReadFlags.NONE); |
assertEquals(MojoResult.OK, result.getMojoResult()); |
assertEquals(message.getData(), receivedResponseMessage); |