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

mojo/edk/system/local_message_pipe_endpoint.cc

Index: mojo/edk/system/local_message_pipe_endpoint.cc
diff --git a/mojo/edk/system/local_message_pipe_endpoint.cc b/mojo/edk/system/local_message_pipe_endpoint.cc
index 5d728422bad47157d7fa2cc4486b94bc7f8d3d60..af5915593807ba3195b266a71fd7f2f2d14d9058 100644
--- a/mojo/edk/system/local_message_pipe_endpoint.cc
+++ b/mojo/edk/system/local_message_pipe_endpoint.cc
@@ -150,9 +150,9 @@ HandleSignalsState LocalMessagePipeEndpoint::GetHandleSignalsState() const {
 
 MojoResult LocalMessagePipeEndpoint::AddAwakable(
     Awakable* awakable,
-    MojoHandleSignals signals,
-    bool force,
     uint64_t context,
+    bool force,
+    MojoHandleSignals signals,
     HandleSignalsState* signals_state) {
   DCHECK(is_open_);
 
@@ -161,31 +161,26 @@ MojoResult LocalMessagePipeEndpoint::AddAwakable(
     *signals_state = state;
   if (state.satisfies(signals)) {
     if (force)
-      awakable_list_.Add(awakable, signals, context);
+      awakable_list_.Add(awakable, context, signals);
     return MOJO_RESULT_ALREADY_EXISTS;
   }
-  if (!state.can_satisfy(signals))
+  if (!state.can_satisfy(signals)) {
+    if (force)
+      awakable_list_.Add(awakable, context, signals);
     return MOJO_RESULT_FAILED_PRECONDITION;
+  }
 
-  awakable_list_.Add(awakable, signals, context);
+  awakable_list_.Add(awakable, context, signals);
   return MOJO_RESULT_OK;
 }
 
 void LocalMessagePipeEndpoint::RemoveAwakable(
-    Awakable* awakable,
-    HandleSignalsState* signals_state) {
-  DCHECK(is_open_);
-  awakable_list_.Remove(awakable);
-  if (signals_state)
-    *signals_state = GetHandleSignalsState();
-}
-
-void LocalMessagePipeEndpoint::RemoveAwakableWithContext(
+    bool match_context,
     Awakable* awakable,
     uint64_t context,
     HandleSignalsState* signals_state) {
   DCHECK(is_open_);
-  awakable_list_.RemoveWithContext(awakable, context);
+  awakable_list_.Remove(match_context, awakable, context);
   if (signals_state)
     *signals_state = GetHandleSignalsState();
 }