Index: chrome/common/service_process_util_posix.h |
diff --git a/chrome/common/service_process_util_posix.h b/chrome/common/service_process_util_posix.h |
index 8d91faf513dda9fa7dc7205695f45d69325b3eb2..2a5339e7099b48088c855868a4f2781aeb751bcf 100644 |
--- a/chrome/common/service_process_util_posix.h |
+++ b/chrome/common/service_process_util_posix.h |
@@ -9,8 +9,9 @@ |
#include <signal.h> |
+#include <memory> |
+ |
#include "base/callback.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "build/build_config.h" |
@@ -71,10 +72,10 @@ struct ServiceProcessState::StateData |
base::FilePathWatcher executable_watcher; |
#endif // OS_MACOSX |
#if defined(OS_POSIX) && !defined(OS_MACOSX) |
- scoped_ptr<MultiProcessLock> initializing_lock; |
- scoped_ptr<MultiProcessLock> running_lock; |
+ std::unique_ptr<MultiProcessLock> initializing_lock; |
+ std::unique_ptr<MultiProcessLock> running_lock; |
#endif |
- scoped_ptr<ServiceProcessTerminateMonitor> terminate_monitor; |
+ std::unique_ptr<ServiceProcessTerminateMonitor> terminate_monitor; |
base::MessageLoopForIO::FileDescriptorWatcher watcher; |
int sockets[2]; |
struct sigaction old_action; |