Add CompositeMachMessageServer and its test

util/mach/exc_server_variants.cc

Index: util/mach/exc_server_variants.cc
diff --git a/util/mach/exc_server_variants.cc b/util/mach/exc_server_variants.cc
index 0376e600a905b1677d71773e142369b716ef6618..7dbe553f3a5e75d4d5a9ffc86fb0d310941a6f4f 100644
--- a/util/mach/exc_server_variants.cc
+++ b/util/mach/exc_server_variants.cc
@@ -318,6 +318,16 @@ bool ExcServer::MachMessageServerFunction(const mach_msg_header_t* in_header,
   return false;
 }
 
+std::set<mach_msg_id_t> ExcServer::MachMessageServerRequestIDs() {
+  const mach_msg_id_t request_ids[] = {
+      kMachMessageIDExceptionRaise,
+      kMachMessageIDExceptionRaiseState,
+      kMachMessageIDExceptionRaiseStateIdentity
+  };
+  return std::set<mach_msg_id_t>(
+      &request_ids[0], &request_ids[arraysize(request_ids)]);
+}
+
 mach_msg_size_t ExcServer::MachMessageServerRequestSize() {
   return sizeof(__RequestUnion__exc_subsystem);
 }
@@ -459,6 +469,16 @@ bool MachExcServer::MachMessageServerFunction(
   return false;
 }
 
+std::set<mach_msg_id_t> MachExcServer::MachMessageServerRequestIDs() {
+  const mach_msg_id_t request_ids[] = {
+      kMachMessageIDMachExceptionRaise,
+      kMachMessageIDMachExceptionRaiseState,
+      kMachMessageIDMachExceptionRaiseStateIdentity
+  };
+  return std::set<mach_msg_id_t>(
+      &request_ids[0], &request_ids[arraysize(request_ids)]);
+}
+
 mach_msg_size_t MachExcServer::MachMessageServerRequestSize() {
   return sizeof(__RequestUnion__mach_exc_subsystem);
 }
@@ -689,6 +709,17 @@ bool UniversalMachExcServer::MachMessageServerFunction(
   return false;
 }
 
+std::set<mach_msg_id_t> UniversalMachExcServer::MachMessageServerRequestIDs() {
+  std::set<mach_msg_id_t> request_ids =
+      exc_server_.MachMessageServerRequestIDs();
+
+  std::set<mach_msg_id_t> mach_exc_request_ids =
+      mach_exc_server_.MachMessageServerRequestIDs();
+  request_ids.insert(mach_exc_request_ids.begin(), mach_exc_request_ids.end());
+
+  return request_ids;
+}
+
 mach_msg_size_t UniversalMachExcServer::MachMessageServerRequestSize() {
   return std::max(mach_exc_server_.MachMessageServerRequestSize(),
                   exc_server_.MachMessageServerRequestSize());