Rationalize AddAwakable...() and RemoveAwakable...() methods.

mojo/edk/system/message_pipe_test_utils.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/edk/system/message_pipe_test_utils.h"
 
 #include <utility>
 
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/platform/thread_utils.h"
@@ skipping 12 matching lines @@
 namespace system {
 namespace test {
 
 MojoResult WaitIfNecessary(MessagePipe* mp,
                            MojoHandleSignals signals,
                            HandleSignalsState* signals_state) {
   Waiter waiter;
   waiter.Init();
 
   MojoResult add_result =
-      mp->AddAwakable(0, &waiter, signals, false, 0, signals_state);
+      mp->AddAwakable(0, &waiter, 0, false, signals, signals_state);
   if (add_result != MOJO_RESULT_OK) {
     return (add_result == MOJO_RESULT_ALREADY_EXISTS) ? MOJO_RESULT_OK
                                                       : add_result;
   }
 
   MojoResult wait_result =
       waiter.Wait(MOJO_DEADLINE_INDEFINITE, nullptr, nullptr);
-  mp->RemoveAwakable(0, &waiter, signals_state);
+  mp->RemoveAwakable(0, false, &waiter, 0, signals_state);
   return wait_result;
 }
 
 ChannelThread::ChannelThread(embedder::PlatformSupport* platform_support)
     : platform_support_(platform_support),
       test_io_thread_(TestIOThread::StartMode::MANUAL) {}
 
 ChannelThread::~ChannelThread() {
   Stop();
 }
@@ skipping 57 matching lines @@
 }
 
 void MultiprocessMessagePipeTestBase::Init(RefPtr<ChannelEndpoint>&& ep) {
   channel_thread_.Start(helper_.server_platform_handle.Pass(), std::move(ep));
 }
 #endif  // !defined(OS_IOS)
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo