Split the //mojo/public/cpp/test_support:test_utils target.

mojo/public/cpp/test_support/lib/test_utils.cc

Index: mojo/public/cpp/test_support/lib/test_utils.cc
diff --git a/mojo/public/cpp/test_support/lib/test_utils.cc b/mojo/public/cpp/test_support/lib/test_utils.cc
index fc794a86226d2a1f7c5333e97350f74c1ba679f6..15ab8f69cb1cac018017399a4963f140da5ba438 100644
--- a/mojo/public/cpp/test_support/lib/test_utils.cc
+++ b/mojo/public/cpp/test_support/lib/test_utils.cc
@@ -4,20 +4,17 @@
 
 #include "mojo/public/cpp/test_support/test_utils.h"
 
-#include "mojo/public/cpp/system/core.h"
-#include "mojo/public/cpp/test_support/test_support.h"
+#include "mojo/public/cpp/system/handle.h"
+#include "mojo/public/cpp/system/message_pipe.h"
 
 namespace mojo {
 namespace test {
 
 bool WriteTextMessage(const MessagePipeHandle& handle,
                       const std::string& text) {
-  MojoResult rv = WriteMessageRaw(handle,
-                                  text.data(),
-                                  static_cast<uint32_t>(text.size()),
-                                  nullptr,
-                                  0,
-                                  MOJO_WRITE_MESSAGE_FLAG_NONE);
+  MojoResult rv =
+      WriteMessageRaw(handle, text.data(), static_cast<uint32_t>(text.size()),
+                      nullptr, 0u, MOJO_WRITE_MESSAGE_FLAG_NONE);
   return rv == MOJO_RESULT_OK;
 }
 
@@ -25,13 +22,10 @@ bool ReadTextMessage(const MessagePipeHandle& handle, std::string* text) {
   MojoResult rv;
   bool did_wait = false;
 
-  uint32_t num_bytes = 0, num_handles = 0;
+  uint32_t num_bytes = 0u;
+  uint32_t num_handles = 0u;
   for (;;) {
-    rv = ReadMessageRaw(handle,
-                        nullptr,
-                        &num_bytes,
-                        nullptr,
-                        &num_handles,
+    rv = ReadMessageRaw(handle, nullptr, &num_bytes, nullptr, &num_handles,
                         MOJO_READ_MESSAGE_FLAG_NONE);
     if (rv == MOJO_RESULT_SHOULD_WAIT) {
       if (did_wait) {
@@ -50,21 +44,13 @@ bool ReadTextMessage(const MessagePipeHandle& handle, std::string* text) {
   }
 
   text->resize(num_bytes);
-  rv = ReadMessageRaw(handle,
-                      &text->at(0),
-                      &num_bytes,
-                      nullptr,
-                      &num_handles,
+  rv = ReadMessageRaw(handle, &text->at(0), &num_bytes, nullptr, &num_handles,
                       MOJO_READ_MESSAGE_FLAG_NONE);
   return rv == MOJO_RESULT_OK;
 }
 
 bool DiscardMessage(const MessagePipeHandle& handle) {
-  MojoResult rv = ReadMessageRaw(handle,
-                                 nullptr,
-                                 nullptr,
-                                 nullptr,
-                                 nullptr,
+  MojoResult rv = ReadMessageRaw(handle, nullptr, nullptr, nullptr, nullptr,
                                  MOJO_READ_MESSAGE_FLAG_MAY_DISCARD);
   return rv == MOJO_RESULT_OK;
 }