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

mojo/edk/system/channel_unittest.cc

 // Copyright 2014 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/channel.h"
 
 #include <utility>
 
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/channel_endpoint_id.h"
@@ skipping 46 matching lines @@
   io_thread()->PostTaskAndWait([this]() { CreateAndInitChannelOnIOThread(0); });
 
   RefPtr<ChannelEndpoint> channel_endpoint;
   auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
 
   channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
 
   Waiter waiter;
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
-            mp->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false, 123,
+            mp->AddAwakable(0, &waiter, 123, false, MOJO_HANDLE_SIGNAL_READABLE,
                             nullptr));
 
   // Don't wait for the shutdown to run ...
   io_thread()->PostTaskAndWait([this]() { ShutdownChannelOnIOThread(0); });
 
   // ... since this |Wait()| should fail once the channel is shut down.
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
             waiter.Wait(MOJO_DEADLINE_INDEFINITE, nullptr, nullptr));
   HandleSignalsState hss;
-  mp->RemoveAwakable(0, &waiter, &hss);
+  mp->RemoveAwakable(0, false, &waiter, 0, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals);
 
   mp->Close(0);
 
   EXPECT_TRUE(channel(0)->HasOneRef());
 }
 
 // ChannelTest.WaitAfterAttachRunAndShutdown -----------------------------------
 
 TEST_F(ChannelTest, WaitAfterAttachRunAndShutdown) {
   io_thread()->PostTaskAndWait([this]() { CreateAndInitChannelOnIOThread(0); });
 
   RefPtr<ChannelEndpoint> channel_endpoint;
   auto mp = MessagePipe::CreateLocalProxy(&channel_endpoint);
 
   channel(0)->SetBootstrapEndpoint(std::move(channel_endpoint));
 
   io_thread()->PostTaskAndWait([this]() { ShutdownChannelOnIOThread(0); });
 
   Waiter waiter;
   waiter.Init();
   HandleSignalsState hss;
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-            mp->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false, 123,
+            mp->AddAwakable(0, &waiter, 123, false, MOJO_HANDLE_SIGNAL_READABLE,
                             &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals);
 
   mp->Close(0);
 
   EXPECT_TRUE(channel(0)->HasOneRef());
 }
 
 // ChannelTest.EndpointChannelShutdownRace -------------------------------------
@@ skipping 19 matching lines @@
     io_thread()->PostTaskAndWait([]() {});
     EXPECT_FALSE(channel(0));
   }
 }
 
 // TODO(vtl): More. ------------------------------------------------------------
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo