Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480

mojo/edk/system/message_pipe_unittest.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.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "base/time/time.h"
 #include "mojo/edk/system/waiter.h"
@@ skipping 21 matching lines @@
 
   int32_t buffer[2];
   const uint32_t kBufferSize = static_cast<uint32_t>(sizeof(buffer));
   uint32_t buffer_size;
 
   // Nothing to read yet on port 0.
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(kBufferSize, buffer_size);
   EXPECT_EQ(123, buffer[0]);
   EXPECT_EQ(456, buffer[1]);
 
   // Ditto for port 1.
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
 
   // Write from port 1 (to port 0).
   buffer[0] = 789012345;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(1,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(1, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Read from port 0.
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
   EXPECT_EQ(789012345, buffer[0]);
   EXPECT_EQ(456, buffer[1]);
 
   // Read again from port 0 -- it should be empty.
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
 
   // Write two messages from port 0 (to port 1).
   buffer[0] = 123456789;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(0,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(0, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
   buffer[0] = 234567890;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(0,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(0, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Read from port 1 with buffer size 0 (should get the size of next message).
   // Also test that giving a null buffer is okay when the buffer size is 0.
   buffer_size = 0;
   EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED,
-            mp->ReadMessage(1,
-                            NullUserPointer(),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
-                            MOJO_READ_MESSAGE_FLAG_NONE));
+            mp->ReadMessage(1, NullUserPointer(), MakeUserPointer(&buffer_size),
+                            0, nullptr, MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
 
   // Read from port 1 with buffer size 1 (too small; should get the size of next
   // message).
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = 1;
   EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
   EXPECT_EQ(123, buffer[0]);
   EXPECT_EQ(456, buffer[1]);
 
   // Read from port 1.
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
   EXPECT_EQ(123456789, buffer[0]);
   EXPECT_EQ(456, buffer[1]);
 
   // Read again from port 1.
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
   EXPECT_EQ(234567890, buffer[0]);
   EXPECT_EQ(456, buffer[1]);
 
   // Read again from port 1 -- it should be empty.
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
 
   // Write from port 0 (to port 1).
   buffer[0] = 345678901;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(0,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(0, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Close port 0.
   mp->Close(0);
 
   // Try to write from port 1 (to port 0).
   buffer[0] = 456789012;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-            mp->WriteMessage(1,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(1, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Read from port 1; should still get message (even though port 0 was closed).
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
   EXPECT_EQ(345678901, buffer[0]);
   EXPECT_EQ(456, buffer[1]);
 
   // Read again from port 1 -- it should be empty (and port 0 is closed).
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
 
   mp->Close(1);
 }
 
 TEST(MessagePipeTest, CloseWithQueuedIncomingMessages) {
   scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalLocal());
 
   int32_t buffer[1];
   const uint32_t kBufferSize = static_cast<uint32_t>(sizeof(buffer));
   uint32_t buffer_size;
 
   // Write some messages from port 1 (to port 0).
   for (int32_t i = 0; i < 5; i++) {
     buffer[0] = i;
     EXPECT_EQ(MOJO_RESULT_OK,
-              mp->WriteMessage(1,
-                               UserPointer<const void>(buffer),
-                               kBufferSize,
-                               nullptr,
-                               MOJO_WRITE_MESSAGE_FLAG_NONE));
+              mp->WriteMessage(1, UserPointer<const void>(buffer), kBufferSize,
+                               nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
   }
 
   // Port 0 shouldn't be empty.
   buffer_size = 0;
   EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED,
-            mp->ReadMessage(0,
-                            NullUserPointer(),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
-                            MOJO_READ_MESSAGE_FLAG_NONE));
+            mp->ReadMessage(0, NullUserPointer(), MakeUserPointer(&buffer_size),
+                            0, nullptr, MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(kBufferSize, buffer_size);
 
   // Close port 0 first, which should have outstanding (incoming) messages.
   mp->Close(0);
   mp->Close(1);
 }
 
 TEST(MessagePipeTest, DiscardMode) {
   scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalLocal());
 
   int32_t buffer[2];
   const uint32_t kBufferSize = static_cast<uint32_t>(sizeof(buffer));
   uint32_t buffer_size;
 
   // Write from port 1 (to port 0).
   buffer[0] = 789012345;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(1,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(1, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Read/discard from port 0 (no buffer); get size.
   buffer_size = 0;
   EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED,
-            mp->ReadMessage(0,
-                            NullUserPointer(),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
-                            MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
+            mp->ReadMessage(0, NullUserPointer(), MakeUserPointer(&buffer_size),
+                            0, nullptr, MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
 
   // Read again from port 0 -- it should be empty.
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
 
   // Write from port 1 (to port 0).
   buffer[0] = 890123456;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(1,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(1, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Read from port 0 (buffer big enough).
   buffer[0] = 123;
   buffer[1] = 456;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
   EXPECT_EQ(890123456, buffer[0]);
   EXPECT_EQ(456, buffer[1]);
 
   // Read again from port 0 -- it should be empty.
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
 
   // Write from port 1 (to port 0).
   buffer[0] = 901234567;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(1,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(1, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Read/discard from port 0 (buffer too small); get size.
   buffer_size = 1;
   EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
   EXPECT_EQ(static_cast<uint32_t>(sizeof(buffer[0])), buffer_size);
 
   // Read again from port 0 -- it should be empty.
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
 
   // Write from port 1 (to port 0).
   buffer[0] = 123456789;
   buffer[1] = 0;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(1,
-                             UserPointer<const void>(buffer),
-                             static_cast<uint32_t>(sizeof(buffer[0])),
-                             nullptr,
+            mp->WriteMessage(1, UserPointer<const void>(buffer),
+                             static_cast<uint32_t>(sizeof(buffer[0])), nullptr,
                              MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Discard from port 0.
   buffer_size = 1;
   EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED,
-            mp->ReadMessage(0,
-                            NullUserPointer(),
-                            NullUserPointer(),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, NullUserPointer(), NullUserPointer(), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
 
   // Read again from port 0 -- it should be empty.
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT,
-            mp->ReadMessage(0,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(0, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_MAY_DISCARD));
 
   mp->Close(0);
   mp->Close(1);
 }
 
 TEST(MessagePipeTest, BasicWaiting) {
   scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalLocal());
   Waiter waiter;
   HandleSignalsState hss;
 
   int32_t buffer[1];
   const uint32_t kBufferSize = static_cast<uint32_t>(sizeof(buffer));
   uint32_t buffer_size;
 
   // Always writable (until the other port is closed).
   waiter.Init();
   hss = HandleSignalsState();
   EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
             mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 0, &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfiable_signals);
   waiter.Init();
   hss = HandleSignalsState();
-  EXPECT_EQ(
-      MOJO_RESULT_ALREADY_EXISTS,
-      mp->AddWaiter(0,
-                    &waiter,
-                    MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
-                    0,
-                    &hss));
+  EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
+            mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE |
+                                          MOJO_HANDLE_SIGNAL_WRITABLE,
+                          0, &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfiable_signals);
 
   // Not yet readable.
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 1, nullptr));
   EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, nullptr));
   hss = HandleSignalsState();
   mp->RemoveWaiter(0, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfiable_signals);
 
   // Write from port 0 (to port 1), to make port 1 readable.
   buffer[0] = 123456789;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->WriteMessage(0,
-                             UserPointer<const void>(buffer),
-                             kBufferSize,
-                             nullptr,
-                             MOJO_WRITE_MESSAGE_FLAG_NONE));
+            mp->WriteMessage(0, UserPointer<const void>(buffer), kBufferSize,
+                             nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Port 1 should already be readable now.
   waiter.Init();
   hss = HandleSignalsState();
   EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
             mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 2, &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfiable_signals);
   waiter.Init();
   hss = HandleSignalsState();
-  EXPECT_EQ(
-      MOJO_RESULT_ALREADY_EXISTS,
-      mp->AddWaiter(1,
-                    &waiter,
-                    MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
-                    0,
-                    &hss));
+  EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
+            mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE |
+                                          MOJO_HANDLE_SIGNAL_WRITABLE,
+                          0, &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfiable_signals);
   // ... and still writable.
   waiter.Init();
   hss = HandleSignalsState();
   EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
             mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 3, &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
@@ skipping 17 matching lines @@
   hss = HandleSignalsState();
   EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,
             mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 5, &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE, hss.satisfiable_signals);
 
   // Read from port 1.
   buffer[0] = 0;
   buffer_size = kBufferSize;
   EXPECT_EQ(MOJO_RESULT_OK,
-            mp->ReadMessage(1,
-                            UserPointer<void>(buffer),
-                            MakeUserPointer(&buffer_size),
-                            0,
-                            nullptr,
+            mp->ReadMessage(1, UserPointer<void>(buffer),
+                            MakeUserPointer(&buffer_size), 0, nullptr,
                             MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(123456789, buffer[0]);
 
   // Now port 1 should no longer be readable.
   waiter.Init();
   hss = HandleSignalsState();
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
             mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 6, nullptr));
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
 
   mp->Close(1);
 }
 
 TEST(MessagePipeTest, ThreadedWaiting) {
   int32_t buffer[1];
   const uint32_t kBufferSize = static_cast<uint32_t>(sizeof(buffer));
 
   MojoResult result;
   uint32_t context;
 
   // Write to wake up waiter waiting for read.
   {
     scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalLocal());
     test::SimpleWaiterThread thread(&result, &context);
 
     thread.waiter()->Init();
     ASSERT_EQ(MOJO_RESULT_OK,
-              mp->AddWaiter(
-                  1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 1, nullptr));
+              mp->AddWaiter(1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 1,
+                            nullptr));
     thread.Start();
 
     buffer[0] = 123456789;
     // Write from port 0 (to port 1), which should wake up the waiter.
     EXPECT_EQ(MOJO_RESULT_OK,
-              mp->WriteMessage(0,
-                               UserPointer<const void>(buffer),
-                               kBufferSize,
-                               nullptr,
-                               MOJO_WRITE_MESSAGE_FLAG_NONE));
+              mp->WriteMessage(0, UserPointer<const void>(buffer), kBufferSize,
+                               nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
     HandleSignalsState hss;
     mp->RemoveWaiter(1, thread.waiter(), &hss);
     EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
               hss.satisfied_signals);
     EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
               hss.satisfiable_signals);
 
     mp->Close(0);
     mp->Close(1);
   }  // Joins |thread|.
   // The waiter should have woken up successfully.
   EXPECT_EQ(MOJO_RESULT_OK, result);
   EXPECT_EQ(1u, context);
 
   // Close to cancel waiter.
   {
     scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalLocal());
     test::SimpleWaiterThread thread(&result, &context);
 
     thread.waiter()->Init();
     ASSERT_EQ(MOJO_RESULT_OK,
-              mp->AddWaiter(
-                  1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 2, nullptr));
+              mp->AddWaiter(1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 2,
+                            nullptr));
     thread.Start();
 
     // Close port 1 first -- this should result in the waiter being cancelled.
     mp->CancelAllWaiters(1);
     mp->Close(1);
 
     // Port 1 is closed, so |Dispatcher::RemoveWaiter()| wouldn't call into the
     // |MessagePipe| to remove any waiter.
 
     mp->Close(0);
   }  // Joins |thread|.
   EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
   EXPECT_EQ(2u, context);
 
   // Close to make waiter un-wake-up-able.
   {
     scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalLocal());
     test::SimpleWaiterThread thread(&result, &context);
 
     thread.waiter()->Init();
     ASSERT_EQ(MOJO_RESULT_OK,
-              mp->AddWaiter(
-                  1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3, nullptr));
+              mp->AddWaiter(1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3,
+                            nullptr));
     thread.Start();
 
     // Close port 0 first -- this should wake the waiter up, since port 1 will
     // never be readable.
     mp->CancelAllWaiters(0);
     mp->Close(0);
 
     HandleSignalsState hss;
     mp->RemoveWaiter(1, thread.waiter(), &hss);
     EXPECT_EQ(0u, hss.satisfied_signals);
     EXPECT_EQ(0u, hss.satisfiable_signals);
 
     mp->CancelAllWaiters(1);
     mp->Close(1);
   }  // Joins |thread|.
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
   EXPECT_EQ(3u, context);
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo