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 14a9864e30c27256fb3a5b775312497c6ec17550..9c268758934ffefdb5ca8bc3c9c63a275118b95f 100644 |
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java |
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.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; |
@@ -71,10 +72,10 @@ public class ConnectorTest extends MojoTestCase { |
mConnector.accept(mTestMessage); |
assertNull(mErrorHandler.getLastMojoException()); |
ByteBuffer received = ByteBuffer.allocateDirect(DATA_LENGTH); |
- MessagePipeHandle.ReadMessageResult result = mHandle.readMessage(received, 0, |
- MessagePipeHandle.ReadFlags.NONE); |
+ ResultAnd<MessagePipeHandle.ReadMessageResult> result = |
+ mHandle.readMessage(received, 0, MessagePipeHandle.ReadFlags.NONE); |
assertEquals(MojoResult.OK, result.getMojoResult()); |
- assertEquals(DATA_LENGTH, result.getMessageSize()); |
+ assertEquals(DATA_LENGTH, result.getValue().getMessageSize()); |
assertEquals(mTestMessage.getData(), received); |
} |