Index: content/browser/zygote_host/zygote_communication_linux.cc |
diff --git a/content/browser/zygote_host/zygote_communication_linux.cc b/content/browser/zygote_host/zygote_communication_linux.cc |
index 54f5176adbd2e9036bb4da219d700c13ed37bf96..39f7b79e3d58f32ea88699ad1a4cc16a051cb611 100644 |
--- a/content/browser/zygote_host/zygote_communication_linux.cc |
+++ b/content/browser/zygote_host/zygote_communication_linux.cc |
@@ -106,9 +106,10 @@ ssize_t ZygoteCommunication::ReadReply(void* buf, size_t buf_len) { |
return HANDLE_EINTR(read(control_fd_, buf, buf_len)); |
} |
-pid_t ZygoteCommunication::ForkRequest(const std::vector<std::string>& argv, |
- scoped_ptr<FileDescriptorInfo> mapping, |
- const std::string& process_type) { |
+pid_t ZygoteCommunication::ForkRequest( |
+ const std::vector<std::string>& argv, |
+ std::unique_ptr<FileDescriptorInfo> mapping, |
+ const std::string& process_type) { |
DCHECK(init_); |
base::Pickle pickle; |
@@ -309,7 +310,7 @@ void ZygoteCommunication::Init() { |
base::ScopedFD dummy_fd; |
if (using_suid_sandbox) { |
- scoped_ptr<sandbox::SetuidSandboxHost> sandbox_host( |
+ std::unique_ptr<sandbox::SetuidSandboxHost> sandbox_host( |
sandbox::SetuidSandboxHost::Create()); |
sandbox_host->PrependWrapper(&cmd_line); |
sandbox_host->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd); |