Convert //content/renderer from scoped_ptr to std::unique_ptr

content/renderer/gpu/compositor_output_surface.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 "content/renderer/gpu/compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 18 matching lines @@
 namespace content {
 
 CompositorOutputSurface::CompositorOutputSurface(
     int32_t routing_id,
     uint32_t output_surface_id,
     const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
     const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
 #if defined(ENABLE_VULKAN)
     const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
 #endif
-    scoped_ptr<cc::SoftwareOutputDevice> software_device,
+    std::unique_ptr<cc::SoftwareOutputDevice> software_device,
     scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
     bool use_swap_compositor_frame_message)
     : OutputSurface(context_provider,
                     worker_context_provider,
 #if defined(ENABLE_VULKAN)
                     vulkan_context_provider,
 #endif
                     std::move(software_device)),
       output_surface_id_(output_surface_id),
       use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
@@ skipping 40 matching lines @@
     return;
   if (output_surface_proxy_.get())
     output_surface_proxy_->ClearOutputSurface();
   output_surface_filter_->RemoveHandlerOnCompositorThread(
       routing_id_, output_surface_filter_handler_);
   cc::OutputSurface::DetachFromClient();
 }
 
 void CompositorOutputSurface::ShortcutSwapAck(
     uint32_t output_surface_id,
-    scoped_ptr<cc::GLFrameData> gl_frame_data) {
+    std::unique_ptr<cc::GLFrameData> gl_frame_data) {
   if (!layout_test_previous_frame_ack_) {
     layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck);
     layout_test_previous_frame_ack_->gl_frame_data.reset(new cc::GLFrameData);
   }
 
   OnSwapAck(output_surface_id, *layout_test_previous_frame_ack_);
 
   layout_test_previous_frame_ack_->gl_frame_data = std::move(gl_frame_data);
 }
 
@@ skipping 25 matching lines @@
 
       context_provider()->ContextSupport()->SignalSyncToken(sync_token,
                                                             closure);
     } else {
       base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, closure);
     }
     client_->DidSwapBuffers();
     return;
   } else {
     {
-      std::vector<scoped_ptr<IPC::Message>> messages;
+      std::vector<std::unique_ptr<IPC::Message>> messages;
       std::vector<IPC::Message> messages_to_deliver_with_frame;
-      scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
-          frame_swap_message_queue_->AcquireSendMessageScope();
+      std::unique_ptr<FrameSwapMessageQueue::SendMessageScope>
+          send_message_scope =
+              frame_swap_message_queue_->AcquireSendMessageScope();
       frame_swap_message_queue_->DrainMessages(&messages);
       FrameSwapMessageQueue::TransferMessages(&messages,
                                               &messages_to_deliver_with_frame);
       Send(new ViewHostMsg_SwapCompositorFrame(routing_id_,
                                                output_surface_id_,
                                                *frame,
                                                messages_to_deliver_with_frame));
       // ~send_message_scope.
     }
     client_->DidSwapBuffers();
@@ skipping 37 matching lines @@
   if (output_surface_id != output_surface_id_)
     return;
   ReclaimResources(&ack);
 }
 
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 }  // namespace content