Mojo: MojoWaitFlags -> MojoHandleSignals.

I still have to rename MOJO_WAIT_... and MojoWaitFlagsState, but I'll do
that separately.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/345463003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278012 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/mojo/android/system/core_impl.cc b/mojo/android/system/core_impl.cc
index 366573c..e7899f6 100644
--- a/mojo/android/system/core_impl.cc
+++ b/mojo/android/system/core_impl.cc
@@ -70,9 +70,9 @@ static jint WaitMany(JNIEnv* env,
 
   const size_t nb_handles = buffer_size / record_size;
   const MojoHandle* handle_start = static_cast<const MojoHandle*>(buffer_start);
-  const MojoWaitFlags* flags_start =
-      static_cast<const MojoWaitFlags*>(handle_start + nb_handles);
-  return MojoWaitMany(handle_start, flags_start, nb_handles, deadline);
+  const MojoHandleSignals* signals_start =
+      static_cast<const MojoHandleSignals*>(handle_start + nb_handles);
+  return MojoWaitMany(handle_start, signals_start, nb_handles, deadline);
 }
 
 static jobject CreateMessagePipe(JNIEnv* env, jobject jcaller) {
@@ -129,9 +129,9 @@ static jint Close(JNIEnv* env, jobject jcaller, jint mojo_handle) {
 static jint Wait(JNIEnv* env,
                  jobject jcaller,
                  jint mojo_handle,
-                 jint flags,
+                 jint signals,
                  jlong deadline) {
-  return MojoWait(mojo_handle, flags, deadline);
+  return MojoWait(mojo_handle, signals, deadline);
 }
 
 static jint WriteMessage(JNIEnv* env,
@@ -322,7 +322,7 @@ static int Unmap(JNIEnv* env, jobject jcaller, jobject buffer) {
 static jobject AsyncWait(JNIEnv* env,
                          jobject jcaller,
                          jint mojo_handle,
-                         jint flags,
+                         jint signals,
                          jlong deadline,
                          jobject callback) {
   AsyncWaitCallbackData* callback_data =
@@ -330,7 +330,7 @@ static jobject AsyncWait(JNIEnv* env,
   MojoAsyncWaitID cancel_id;
   if (static_cast<MojoHandle>(mojo_handle) != MOJO_HANDLE_INVALID) {
     cancel_id = mojo::GetDefaultAsyncWaiter()->AsyncWait(mojo_handle,
-                                                         flags,
+                                                         signals,
                                                          deadline,
                                                          AsyncWaitCallback,
                                                          callback_data);