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

mojo/edk/system/local_message_pipe_endpoint.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/local_message_pipe_endpoint.h"
 
 #include <string.h>
 
 #include <utility>
 
@@ skipping 132 matching lines @@
         MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE;
   } else {
     rv.satisfied_signals |= MOJO_HANDLE_SIGNAL_PEER_CLOSED;
   }
   rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_PEER_CLOSED;
   return rv;
 }
 
 MojoResult LocalMessagePipeEndpoint::AddAwakable(
     Awakable* awakable,
+    uint64_t context,
+    bool force,
     MojoHandleSignals signals,
-    bool force,
-    uint64_t context,
     HandleSignalsState* signals_state) {
   DCHECK(is_open_);
 
   HandleSignalsState state = GetHandleSignalsState();
   if (signals_state)
     *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();
 }
 
 }  // namespace system
 }  // namespace mojo