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

mojo/edk/system/waiter_test_utils.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/edk/system/waiter_test_utils.h"
 
 #include <utility>
 
 using mojo::util::RefPtr;
 
@@ skipping 40 matching lines @@
   *signals_state_out_ = HandleSignalsState(~0u, ~0u);
 }
 
 WaiterThread::~WaiterThread() {
   Join();
 }
 
 void WaiterThread::Run() {
   waiter_.Init();
 
-  *result_out_ = dispatcher_->AddAwakable(&waiter_, handle_signals_, context_,
-                                          signals_state_out_);
+  *result_out_ = dispatcher_->AddAwakable(&waiter_, context_, false,
+                                          handle_signals_, signals_state_out_);
   if (*result_out_ != MOJO_RESULT_OK)
     return;
 
   *did_wait_out_ = true;
   *result_out_ = waiter_.Wait(deadline_, context_out_, nullptr);
-  dispatcher_->RemoveAwakable(&waiter_, signals_state_out_);
+  dispatcher_->RemoveAwakable(false, &waiter_, 0, signals_state_out_);
 }
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo