Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1

mojo/android/system/core_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/android/system/core_impl.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/library_loader/library_loader_hooks.h"
@@ skipping 66 matching lines @@
   const size_t nb_handles = (buffer_size - 4) / size_per_handle;
   const MojoHandle* handle_start =
       reinterpret_cast<const MojoHandle*>(buffer_start);
   const MojoHandleSignals* signals_start =
       reinterpret_cast<const MojoHandleSignals*>(buffer_start + 4 * nb_handles);
   MojoHandleSignalsState* states_start =
       reinterpret_cast<MojoHandleSignalsState*>(buffer_start + 8 * nb_handles);
   uint32_t* result_index =
       reinterpret_cast<uint32_t*>(buffer_start + 16 * nb_handles);
   *result_index = static_cast<uint32_t>(-1);
-  return MojoNewWaitMany(handle_start, signals_start, nb_handles, deadline,
-                         result_index, states_start);
+  return MojoWaitMany(handle_start, signals_start, nb_handles, deadline,
+                      result_index, states_start);
 }
 
 static jobject CreateMessagePipe(JNIEnv* env,
                                  jobject jcaller,
                                  jobject options_buffer) {
   const MojoCreateMessagePipeOptions* options = NULL;
   if (options_buffer) {
     const void* buffer_start = env->GetDirectBufferAddress(options_buffer);
     DCHECK(buffer_start);
     DCHECK_EQ(reinterpret_cast<const uintptr_t>(buffer_start) % 8, 0u);
@@ skipping 60 matching lines @@
                  jint signals,
                  jlong deadline) {
   // Buffer contains space for the MojoHandleSignalsState
   void* buffer_start = env->GetDirectBufferAddress(buffer);
   DCHECK(buffer_start);
   DCHECK_EQ(reinterpret_cast<const uintptr_t>(buffer_start) % 8, 0u);
   DCHECK_EQ(sizeof(struct MojoHandleSignalsState),
             static_cast<size_t>(env->GetDirectBufferCapacity(buffer)));
   struct MojoHandleSignalsState* signals_state =
       static_cast<struct MojoHandleSignalsState*>(buffer_start);
-  return MojoNewWait(mojo_handle, signals, deadline, signals_state);
+  return MojoWait(mojo_handle, signals, deadline, signals_state);
 }
 
 static jint WriteMessage(JNIEnv* env,
                          jobject jcaller,
                          jint mojo_handle,
                          jobject bytes,
                          jint num_bytes,
                          jobject handles_buffer,
                          jint flags) {
   const void* buffer_start = 0;
@@ skipping 214 matching lines @@
       reinterpret_cast<AsyncWaitCallbackData*>(data_ptr));
   Environment::GetDefaultAsyncWaiter()->CancelWait(id);
 }
 
 bool RegisterCoreImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo