    // TODO(rsesek): In the 10.7 SDK, there's audit_token_to_pid().
    pid_t sender_pid;
    audit_token_to_au32(token,
-@@ -75,22 +77,26 @@ bool XPCMessageServer::SendReply(IPCMessage reply) {
+@@ -73,22 +75,26 @@ bool XPCMessageServer::SendReply(IPCMessage reply) {
    if (!reply.xpc)
      return false;
  

 
   message_server_->ForwardMessage(request, sandbox_->real_bootstrap_port());
diff --git a/sandbox/mac/os_compatibility.cc b/sandbox/mac/os_compatibility.cc
index 5ddf6a5..1b85e2c 100644
--- a/sandbox/mac/os_compatibility.cc
+++ b/sandbox/mac/os_compatibility.cc
@@ -184,7 +184,9 @@ class OSCompatibility_10_10 : public OSCompatibility {
 
   void WriteServiceLookUpReply(IPCMessage message,
                                mach_port_t service_port) override {

     // On non-XPC launchd systems, bootstrap_look_up() is MIG-based and
     // generally safe.
diff --git a/sandbox/mac/xpc_message_server.cc b/sandbox/mac/xpc_message_server.cc
index 273419b..595abce 100644
--- a/sandbox/mac/xpc_message_server.cc
+++ b/sandbox/mac/xpc_message_server.cc
@@ -52,7 +52,9 @@ void XPCMessageServer::Shutdown() {
 
 pid_t XPCMessageServer::GetMessageSenderPID(IPCMessage request) {
   audit_token_t token;
