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

mojo/edk/system/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/message_pipe_endpoint.h"
 
 #include "base/logging.h"
 
 namespace mojo {
 namespace system {
@@ skipping 10 matching lines @@
   NOTREACHED();
   return MOJO_RESULT_INTERNAL;
 }
 
 HandleSignalsState MessagePipeEndpoint::GetHandleSignalsState() const {
   NOTREACHED();
   return HandleSignalsState();
 }
 
 MojoResult MessagePipeEndpoint::AddAwakable(Awakable* /*awakable*/,
+                                            uint64_t /*context*/,
+                                            bool /*force*/,
                                             MojoHandleSignals /*signals*/,
-                                            bool /*force*/,
-                                            uint64_t /*context*/,
                                             HandleSignalsState* signals_state) {
   NOTREACHED();
   if (signals_state)
     *signals_state = HandleSignalsState();
   return MOJO_RESULT_INTERNAL;
 }
 
-void MessagePipeEndpoint::RemoveAwakable(Awakable* /*awakable*/,
+void MessagePipeEndpoint::RemoveAwakable(bool /*match_context*/,
+                                         Awakable* /*awakable*/,
+                                         uint64_t /*context*/,
                                          HandleSignalsState* signals_state) {
   NOTREACHED();
   if (signals_state)
     *signals_state = HandleSignalsState();
 }
 
-void MessagePipeEndpoint::RemoveAwakableWithContext(
-    Awakable* /*awakable*/,
-    uint64_t /*context*/,
-    HandleSignalsState* signals_state) {
-  NOTREACHED();
-  if (signals_state)
-    *signals_state = HandleSignalsState();
-}
-
 void MessagePipeEndpoint::Attach(ChannelEndpoint* /*channel_endpoint*/) {
   NOTREACHED();
 }
 
 }  // namespace system
 }  // namespace mojo