Convert //ppapi to use std::unique_ptr

ppapi/host/ppapi_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/host/ppapi_host.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 108 matching lines @@
                "Line", IPC_MESSAGE_ID_LINE(msg.type()));
   DCHECK(resource);  // If this fails, host is probably pending.
   proxy::ResourceMessageReplyParams params(resource, 0);
   for (std::vector<SerializedHandle>::const_iterator it = handles.begin();
       it != handles.end(); ++it) {
     params.AppendHandle(*it);
   }
   Send(new PpapiPluginMsg_ResourceReply(params, msg));
 }
 
-scoped_ptr<ResourceHost> PpapiHost::CreateResourceHost(
+std::unique_ptr<ResourceHost> PpapiHost::CreateResourceHost(
     PP_Resource resource,
     PP_Instance instance,
     const IPC::Message& nested_msg) {
-  scoped_ptr<ResourceHost> resource_host;
+  std::unique_ptr<ResourceHost> resource_host;
   DCHECK(!host_factory_filters_.empty());  // Caller forgot to add a factory.
   for (size_t i = 0; i < host_factory_filters_.size(); i++) {
     resource_host = host_factory_filters_[i]->CreateResourceHost(
         this, resource, instance, nested_msg);
     if (resource_host.get())
       break;
   }
   return resource_host;
 }
 
-int PpapiHost::AddPendingResourceHost(scoped_ptr<ResourceHost> resource_host) {
+int PpapiHost::AddPendingResourceHost(
+    std::unique_ptr<ResourceHost> resource_host) {
   // The resource ID should not be assigned.
   if (!resource_host.get() || resource_host->pp_resource() != 0) {
     NOTREACHED();
     return 0;
   }
 
   if (pending_resource_hosts_.size() + resources_.size()
       >= kMaxResourcesPerPlugin) {
     return 0;
   }
 
   int pending_id = next_pending_resource_host_id_++;
   pending_resource_hosts_[pending_id] = std::move(resource_host);
   return pending_id;
 }
 
-void PpapiHost::AddHostFactoryFilter(scoped_ptr<HostFactory> filter) {
+void PpapiHost::AddHostFactoryFilter(std::unique_ptr<HostFactory> filter) {
   host_factory_filters_.push_back(std::move(filter));
 }
 
 void PpapiHost::AddInstanceMessageFilter(
-    scoped_ptr<InstanceMessageFilter> filter) {
+    std::unique_ptr<InstanceMessageFilter> filter) {
   instance_message_filters_.push_back(std::move(filter));
 }
 
 void PpapiHost::OnHostMsgResourceCall(
     const proxy::ResourceMessageCallParams& params,
     const IPC::Message& nested_msg) {
   TRACE_EVENT2("ppapi proxy", "PpapiHost::OnHostMsgResourceCall",
                "Class", IPC_MESSAGE_ID_CLASS(nested_msg.type()),
                "Line", IPC_MESSAGE_ID_LINE(nested_msg.type()));
   HostMessageContext context(params);
@@ skipping 51 matching lines @@
   TRACE_EVENT2("ppapi proxy", "PpapiHost::OnHostMsgResourceCreated",
                "Class", IPC_MESSAGE_ID_CLASS(nested_msg.type()),
                "Line", IPC_MESSAGE_ID_LINE(nested_msg.type()));
 
   if (pending_resource_hosts_.size() + resources_.size()
       >= kMaxResourcesPerPlugin) {
     return;
   }
 
   // Run through all filters until one grabs this message.
-  scoped_ptr<ResourceHost> resource_host =
+  std::unique_ptr<ResourceHost> resource_host =
       CreateResourceHost(params.pp_resource(), instance, nested_msg);
 
   if (!resource_host.get()) {
     NOTREACHED();
     return;
   }
 
   // Resource should have been assigned a nonzero PP_Resource.
   DCHECK(resource_host->pp_resource());
 
@@ skipping 18 matching lines @@
   ResourceMap::iterator found = resources_.find(resource);
   if (found == resources_.end()) {
     NOTREACHED();
     return;
   }
   // Invoking the HostResource destructor might result in looking up the
   // PP_Resource in resources_. std::map is not well specified as to whether the
   // element will be there or not. Therefore, we delay destruction of the
   // HostResource until after we've made sure the map no longer contains
   // |resource|.
-  scoped_ptr<ResourceHost> delete_at_end_of_scope(std::move(found->second));
+  std::unique_ptr<ResourceHost> delete_at_end_of_scope(
+      std::move(found->second));
   resources_.erase(found);
 }
 
 ResourceHost* PpapiHost::GetResourceHost(PP_Resource resource) const {
   ResourceMap::const_iterator found = resources_.find(resource);
   return found == resources_.end() ? NULL : found->second.get();
 }
 
 }  // namespace host
 }  // namespace ppapi