MachMessageServer::Interface implementations: minor cleanups

util/mach/child_port_server_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 76 matching lines @@
 };
 
 class MockChildPortServerInterface : public ChildPortServer::Interface {
  public:
   MOCK_METHOD6(HandleChildPortCheckIn,
                kern_return_t(child_port_server_t server,
                              const child_port_token_t token,
                              mach_port_t port,
                              mach_msg_type_name_t right_type,
                              const mach_msg_trailer_t* trailer,
-                             bool* destroy_complex_request));
+                             bool* destroy_request));
 };
 
 TEST(ChildPortServer, MockChildPortCheckIn) {
   MockChildPortServerInterface server_interface;
   ChildPortServer server(&server_interface);
 
   std::set<mach_msg_id_t> expect_request_ids;
   expect_request_ids.insert(10011);  // There is no constant for this.
   EXPECT_EQ(expect_request_ids, server.MachMessageServerRequestIDs());
 
   ChildPortCheckInRequest request;
-  EXPECT_LE(request.Head.msgh_size, server.MachMessageServerRequestSize());
+  EXPECT_EQ(request.Head.msgh_size, server.MachMessageServerRequestSize());
 
   MIGReply reply;
-  EXPECT_LE(sizeof(reply), server.MachMessageServerReplySize());
+  EXPECT_EQ(sizeof(reply), server.MachMessageServerReplySize());
 
   EXPECT_CALL(server_interface,
               HandleChildPortCheckIn(kServerLocalPort,
                                      kCheckInToken,
                                      kCheckInPort,
                                      kCheckInPortRightType,
                                      Eq(&request.trailer),
                                      Pointee(Eq(false))))
       .WillOnce(Return(MIG_NO_REPLY))
       .RetiresOnSaturation();
 
-  bool destroy_complex_request = false;
+  bool destroy_request = false;
   EXPECT_TRUE(server.MachMessageServerFunction(
       reinterpret_cast<mach_msg_header_t*>(&request),
       reinterpret_cast<mach_msg_header_t*>(&reply),
-      &destroy_complex_request));
-  EXPECT_FALSE(destroy_complex_request);
+      &destroy_request));
+  EXPECT_FALSE(destroy_request);
 
   reply.Verify();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad