Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1

mojo/public/platform/native/system_thunks.cc

 // Copyright 2013 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/public/platform/native/system_thunks.h"
 
 #include <assert.h>
 
 #include "mojo/public/platform/native/thunk_export.h"
 
 extern "C" {
 
 static MojoSystemThunks g_thunks = {0};
 
 MojoTimeTicks MojoGetTimeTicksNow() {
   assert(g_thunks.GetTimeTicksNow);
   return g_thunks.GetTimeTicksNow();
 }
 
 MojoResult MojoClose(MojoHandle handle) {
   assert(g_thunks.Close);
   return g_thunks.Close(handle);
 }
 
 MojoResult MojoWait(MojoHandle handle,
                     MojoHandleSignals signals,
-                    MojoDeadline deadline) {
+                    MojoDeadline deadline,
+                    struct MojoHandleSignalsState* signals_state) {
   assert(g_thunks.Wait);
-  return g_thunks.Wait(handle, signals, deadline);
+  return g_thunks.Wait(handle, signals, deadline, signals_state);
 }
 
 MojoResult MojoWaitMany(const MojoHandle* handles,
                         const MojoHandleSignals* signals,
                         uint32_t num_handles,
-                        MojoDeadline deadline) {
+                        MojoDeadline deadline,
+                        uint32_t* result_index,
+                        struct MojoHandleSignalsState* signals_states) {
   assert(g_thunks.WaitMany);
-  return g_thunks.WaitMany(handles, signals, num_handles, deadline);
-}
-
-MojoResult MojoNewWait(MojoHandle handle,
-                       MojoHandleSignals signals,
-                       MojoDeadline deadline,
-                       struct MojoHandleSignalsState* signals_state) {
-  assert(g_thunks.NewWait);
-  return g_thunks.NewWait(handle, signals, deadline, signals_state);
-}
-
-MojoResult MojoNewWaitMany(const MojoHandle* handles,
-                           const MojoHandleSignals* signals,
-                           uint32_t num_handles,
-                           MojoDeadline deadline,
-                           uint32_t* result_index,
-                           struct MojoHandleSignalsState* signals_states) {
-  assert(g_thunks.NewWaitMany);
-  return g_thunks.NewWaitMany(handles, signals, num_handles, deadline,
-                              result_index, signals_states);
+  return g_thunks.WaitMany(handles, signals, num_handles, deadline,
+                           result_index, signals_states);
 }
 
 MojoResult MojoCreateMessagePipe(const MojoCreateMessagePipeOptions* options,
                                  MojoHandle* message_pipe_handle0,
                                  MojoHandle* message_pipe_handle1) {
   assert(g_thunks.CreateMessagePipe);
   return g_thunks.CreateMessagePipe(options, message_pipe_handle0,
                                     message_pipe_handle1);
 }
 
@@ skipping 107 matching lines @@
 }
 
 extern "C" THUNK_EXPORT size_t MojoSetSystemThunks(
     const MojoSystemThunks* system_thunks) {
   if (system_thunks->size >= sizeof(g_thunks))
     g_thunks = *system_thunks;
   return sizeof(g_thunks);
 }
 
 }  // extern "C"