Rename WaitFlags (etc.) to HandleSignals in Java bindings

mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java

Index: mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java
diff --git a/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java b/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java
index cacedbe002f03fb899c0b4a91636d04ea52fbdaf..6c0475e82664e939ac3cd1d51682c74bc8ec9fec 100644
--- a/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java
+++ b/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java
@@ -79,12 +79,12 @@ public class CoreImpl implements Core, AsyncWaiter {
      * @see Core#waitMany(List, long)
      */
     @Override
-    public WaitManyResult waitMany(List<Pair<Handle, WaitFlags>> handles, long deadline) {
+    public WaitManyResult waitMany(List<Pair<Handle, HandleSignals>> handles, long deadline) {
         // Allocate a direct buffer to allow native code not to reach back to java. Buffer will
         // contain all mojo handles, followed by all flags values.
         ByteBuffer buffer = allocateDirectBuffer(handles.size() * 8);
         int index = 0;
-        for (Pair<Handle, WaitFlags> handle : handles) {
+        for (Pair<Handle, HandleSignals> handle : handles) {
             buffer.putInt(HANDLE_SIZE * index, getMojoHandle(handle.first));
             buffer.putInt(HANDLE_SIZE * handles.size() + FLAG_SIZE * index,
                     handle.second.getFlags());
@@ -100,12 +100,12 @@ public class CoreImpl implements Core, AsyncWaiter {
     }
 
     /**
-     * @see Core#wait(Handle, WaitFlags, long)
+     * @see Core#wait(Handle, HandleSignals, long)
      */
     @Override
-    public int wait(Handle handle, WaitFlags flags, long deadline) {
+    public int wait(Handle handle, HandleSignals signals, long deadline) {
         return filterMojoResultForWait(nativeWait(getMojoHandle(handle),
-                flags.getFlags(), deadline));
+                signals.getFlags(), deadline));
     }
 
     /**
@@ -173,13 +173,12 @@ public class CoreImpl implements Core, AsyncWaiter {
     }
 
     /**
-     * @see AsyncWaiter#asyncWait(Handle, Core.WaitFlags, long, Callback)
+     * @see AsyncWaiter#asyncWait(Handle, Core.HandleSignals, long, Callback)
      */
     @Override
-    public Cancellable asyncWait(Handle handle, WaitFlags flags, long deadline,
+    public Cancellable asyncWait(Handle handle, HandleSignals signals, long deadline,
             Callback callback) {
-        return nativeAsyncWait(getMojoHandle(handle),
-                flags.getFlags(), deadline, callback);
+        return nativeAsyncWait(getMojoHandle(handle), signals.getFlags(), deadline, callback);
     }
 
     int closeWithResult(int mojoHandle) {
@@ -621,7 +620,7 @@ public class CoreImpl implements Core, AsyncWaiter {
 
     private native int nativeClose(int mojoHandle);
 
-    private native int nativeWait(int mojoHandle, int flags, long deadline);
+    private native int nativeWait(int mojoHandle, int signals, long deadline);
 
     private native int nativeWriteMessage(int mojoHandle, ByteBuffer bytes, int numBytes,
             ByteBuffer handlesBuffer, int flags);
@@ -653,7 +652,7 @@ public class CoreImpl implements Core, AsyncWaiter {
 
     private native int nativeUnmap(ByteBuffer buffer);
 
-    private native AsyncWaiterCancellableImpl nativeAsyncWait(int mojoHandle, int flags,
+    private native AsyncWaiterCancellableImpl nativeAsyncWait(int mojoHandle, int signals,
             long deadline, AsyncWaiter.Callback callback);
 
     private native void nativeCancelAsyncWait(long mId, long dataPtr);