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

mojo/edk/system/channel_unittest.cc

Index: mojo/edk/system/channel_unittest.cc
diff --git a/mojo/edk/system/channel_unittest.cc b/mojo/edk/system/channel_unittest.cc
index 6051f40416eb29d971ea83ae2bb1ee8773b357f8..40ef08131ff2721ba5d7727bec6110b3eb91754b 100644
--- a/mojo/edk/system/channel_unittest.cc
+++ b/mojo/edk/system/channel_unittest.cc
@@ -64,7 +64,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) {
   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 ...
@@ -74,7 +74,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) {
   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);
 
@@ -99,7 +99,7 @@ TEST_F(ChannelTest, WaitAfterAttachRunAndShutdown) {
   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);