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

mojo/edk/system/message_pipe.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/message_pipe.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 173 matching lines @@
   DCHECK(port == 0 || port == 1);
 
   MutexLocker locker(&mutex_);
   DCHECK(endpoints_[port]);
 
   return endpoints_[port]->GetHandleSignalsState();
 }
 
 MojoResult MessagePipe::AddAwakable(unsigned port,
                                     Awakable* awakable,
+                                    uint64_t context,
+                                    bool force,
                                     MojoHandleSignals signals,
-                                    bool force,
-                                    uint64_t context,
                                     HandleSignalsState* signals_state) {
   DCHECK(port == 0 || port == 1);
 
   MutexLocker locker(&mutex_);
   DCHECK(endpoints_[port]);
 
-  return endpoints_[port]->AddAwakable(awakable, signals, force, context,
+  return endpoints_[port]->AddAwakable(awakable, context, force, signals,
                                        signals_state);
 }
 
 void MessagePipe::RemoveAwakable(unsigned port,
+                                 bool match_context,
                                  Awakable* awakable,
+                                 uint64_t context,
                                  HandleSignalsState* signals_state) {
   DCHECK(port == 0 || port == 1);
 
   MutexLocker locker(&mutex_);
   DCHECK(endpoints_[port]);
 
-  endpoints_[port]->RemoveAwakable(awakable, signals_state);
-}
-
-void MessagePipe::RemoveAwakableWithContext(unsigned port,
-                                            Awakable* awakable,
-                                            uint64_t context,
-                                            HandleSignalsState* signals_state) {
-  DCHECK(port == 0 || port == 1);
-
-  MutexLocker locker(&mutex_);
-  DCHECK(endpoints_[port]);
-
-  endpoints_[port]->RemoveAwakableWithContext(awakable, context, signals_state);
+  endpoints_[port]->RemoveAwakable(match_context, awakable, context,
+                                   signals_state);
 }
 
 void MessagePipe::StartSerialize(unsigned /*port*/,
                                  Channel* channel,
                                  size_t* max_size,
                                  size_t* max_platform_handles) {
   *max_size = channel->GetSerializedEndpointSize();
   *max_platform_handles = 0;
 }
 
@@ skipping 145 matching lines @@
       LOG(WARNING) << "Enqueueing null dispatcher";
       handles->push_back(Handle());
     }
   }
   message->SetHandles(std::move(handles));
   return MOJO_RESULT_OK;
 }
 
 }  // namespace system
 }  // namespace mojo