Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Unified Diff: mojo/android/javatests/src/org/chromium/mojo/HandleMock.java

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/BUILD.gn ('k') | mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/android/javatests/src/org/chromium/mojo/HandleMock.java
diff --git a/mojo/android/javatests/src/org/chromium/mojo/HandleMock.java b/mojo/android/javatests/src/org/chromium/mojo/HandleMock.java
index 9a7b473341088752f2c0640435f2420d2f004073..427fbec0360ce3ac557ca0500b61bb4d91aa9283 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/HandleMock.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/HandleMock.java
@@ -5,6 +5,7 @@
package org.chromium.mojo;
import org.chromium.mojo.system.Core;
+import org.chromium.mojo.system.Core.WaitResult;
import org.chromium.mojo.system.DataPipe;
import org.chromium.mojo.system.DataPipe.ConsumerHandle;
import org.chromium.mojo.system.DataPipe.ProducerHandle;
@@ -36,9 +37,11 @@ public class HandleMock implements UntypedHandle, MessagePipeHandle,
* @see Handle#wait(Core.HandleSignals, long)
*/
@Override
- public int wait(Core.HandleSignals signals, long deadline) {
+ public WaitResult wait(Core.HandleSignals signals, long deadline) {
// Do nothing.
- return MojoResult.OK;
+ WaitResult result = new WaitResult();
+ result.setMojoResult(MojoResult.OK);
+ return result;
}
/**
« no previous file with comments | « mojo/BUILD.gn ('k') | mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698