MachMessageServer: eliminate argument redundancy

client/simulate_crash_mac_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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "client/simulate_crash.h"
 
 #include <mach/mach.h>
 #include <string.h>
 
 #include "base/basictypes.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
 #include "util/mach/exc_server_variants.h"
 #include "util/mach/exception_behaviors.h"
 #include "util/mach/exception_ports.h"
 #include "util/mach/mach_extensions.h"
+#include "util/mach/mach_message.h"
 #include "util/mach/mach_message_server.h"
 #include "util/mach/symbolic_constants_mach.h"
 #include "util/test/mac/mach_errors.h"
 #include "util/test/mac/mach_multiprocess.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 class TestSimulateCrashMac final : public MachMultiprocess,
@@ skipping 206 matching lines @@
     if (target_ == kExceptionPortsTargetBoth) {
       // The client has registered EXC_CRASH handlers for both its thread and
       // task targets. Run a server that will return a failure code when the
       // exception message is sent to the thread target, which will cause the
       // client to fall back to the task target and send another message.
       succeed_ = false;
       mr = MachMessageServer::Run(&universal_mach_exc_server,
                                   LocalPort(),
                                   MACH_MSG_OPTION_NONE,
                                   MachMessageServer::kOneShot,
-                                  MachMessageServer::kBlocking,
                                   MachMessageServer::kReceiveLargeError,
-                                  MACH_MSG_TIMEOUT_NONE);
+                                  kMachMessageTimeoutWaitIndefinitely);
       EXPECT_EQ(MACH_MSG_SUCCESS, mr)
           << MachErrorMessage(mr, "MachMessageServer::Run");
     }
 
     succeed_ = true;
     mr = MachMessageServer::Run(&universal_mach_exc_server,
                                 LocalPort(),
                                 MACH_MSG_OPTION_NONE,
                                 MachMessageServer::kOneShot,
-                                MachMessageServer::kBlocking,
                                 MachMessageServer::kReceiveLargeError,
-                                MACH_MSG_TIMEOUT_NONE);
+                                kMachMessageTimeoutWaitIndefinitely);
     EXPECT_EQ(MACH_MSG_SUCCESS, mr)
         << MachErrorMessage(mr, "MachMessageServer::Run");
   }
 
   void MachMultiprocessChild() override {
     bool task_valid = target_ == kExceptionPortsTargetTask ||
                       target_ == kExceptionPortsTargetBoth;
     ExceptionPorts task_exception_ports(ExceptionPorts::kTargetTypeTask,
                                         TASK_NULL);
     ASSERT_TRUE(task_exception_ports.SetExceptionPort(
@@ skipping 96 matching lines @@
           test_simulate_crash_mac.Run();
         }
       }
     }
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad