Index: sandbox/mac/launchd_interception_server.h |
diff --git a/sandbox/mac/launchd_interception_server.h b/sandbox/mac/launchd_interception_server.h |
index 0375ca2352e46c14c8e6252d4aef3c483e7a4780..9ed38f13d10a74ac650070948af4d5fa80ed52bd 100644 |
--- a/sandbox/mac/launchd_interception_server.h |
+++ b/sandbox/mac/launchd_interception_server.h |
@@ -5,10 +5,11 @@ |
#ifndef SANDBOX_MAC_LAUNCHD_INTERCEPTION_SERVER_H_ |
#define SANDBOX_MAC_LAUNCHD_INTERCEPTION_SERVER_H_ |
+#include <memory> |
+ |
#include <dispatch/dispatch.h> |
#include "base/mac/scoped_mach_port.h" |
-#include "base/memory/scoped_ptr.h" |
#include "sandbox/mac/message_server.h" |
namespace sandbox { |
@@ -54,7 +55,7 @@ class LaunchdInterceptionServer : public MessageDemuxer { |
const BootstrapSandbox* sandbox_; |
// The Mach IPC server. |
- scoped_ptr<MessageServer> message_server_; |
+ std::unique_ptr<MessageServer> message_server_; |
// Whether or not the system is using an XPC-based launchd. |
bool xpc_launchd_; |
@@ -68,7 +69,7 @@ class LaunchdInterceptionServer : public MessageDemuxer { |
// The compatibility shim that handles differences in message header IDs and |
// request/reply structures between different OS X versions. |
- scoped_ptr<OSCompatibility> compat_shim_; |
+ std::unique_ptr<OSCompatibility> compat_shim_; |
}; |
} // namespace sandbox |