Move mach_message_util.* to mach_message.*

util/mach/mach_message_test.cc

Index: util/mach/mach_message_test.cc
diff --git a/util/mach/mach_message_util_test.cc b/util/mach/mach_message_test.cc
similarity index 91%
rename from util/mach/mach_message_util_test.cc
rename to util/mach/mach_message_test.cc
index 66543067b407b1771b220d51d88a8e83fde0ba15..b807b7ed5205f098b788936f56cf0616d61ba18c 100644
--- a/util/mach/mach_message_util_test.cc
+++ b/util/mach/mach_message_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/mach/mach_message_util.h"
+#include "util/mach/mach_message.h"
 
 #include "base/basictypes.h"
 #include "gtest/gtest.h"
@@ -22,7 +22,7 @@ namespace crashpad {
 namespace test {
 namespace {
 
-TEST(MachMessageUtil, PrepareMIGReplyFromRequest_SetMIGReplyError) {
+TEST(MachMessage, PrepareMIGReplyFromRequest_SetMIGReplyError) {
   mach_msg_header_t request;
   request.msgh_bits =
       MACH_MSGH_BITS_COMPLEX |
@@ -63,7 +63,7 @@ TEST(MachMessageUtil, PrepareMIGReplyFromRequest_SetMIGReplyError) {
   EXPECT_EQ(MIG_BAD_ID, reply.RetCode);
 }
 
-TEST(MachMessageUtil, MachMessageTrailerFromHeader) {
+TEST(MachMessage, MachMessageTrailerFromHeader) {
   mach_msg_empty_t empty;
   empty.send.header.msgh_size = sizeof(mach_msg_empty_send_t);
   EXPECT_EQ(&empty.rcv.trailer,
@@ -82,8 +82,7 @@ TEST(MachMessageUtil, MachMessageTrailerFromHeader) {
 
   TestMessage test;
   test.send.msgh_size = sizeof(TestSendMessage);
-  EXPECT_EQ(&test.receive.trailer,
-            MachMessageTrailerFromHeader(&test.receive));
+  EXPECT_EQ(&test.receive.trailer, MachMessageTrailerFromHeader(&test.receive));
 }
 
 }  // namespace