convert //gpu to std::unique_ptr

gpu/ipc/service/gpu_command_buffer_stub.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 "gpu/ipc/service/gpu_command_buffer_stub.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/hash.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/service/gl_context_virtual.h"
 #include "gpu/command_buffer/service/gl_state_restorer_impl.h"
@@ skipping 25 matching lines @@
 #include "gpu/ipc/service/stream_texture_android.h"
 #endif
 
 namespace gpu {
 struct WaitForCommandState {
   WaitForCommandState(int32_t start, int32_t end, IPC::Message* reply)
       : start(start), end(end), reply(reply) {}
 
   int32_t start;
   int32_t end;
-  scoped_ptr<IPC::Message> reply;
+  std::unique_ptr<IPC::Message> reply;
 };
 
 namespace {
 
 // The GpuCommandBufferMemoryTracker class provides a bridge between the
 // ContextGroup's memory type managers and the GpuMemoryManager class.
 class GpuCommandBufferMemoryTracker : public gles2::MemoryTracker {
  public:
   explicit GpuCommandBufferMemoryTracker(GpuChannel* channel,
                                          uint64_t share_group_tracing_guid)
@@ skipping 16 matching lines @@
   };
 
   uint64_t ClientTracingId() const override { return client_tracing_id_; }
   int ClientId() const override { return client_id_; }
   uint64_t ShareGroupTracingGUID() const override {
     return share_group_tracing_guid_;
   }
 
  private:
   ~GpuCommandBufferMemoryTracker() override {}
-  scoped_ptr<GpuMemoryTrackingGroup> tracking_group_;
+  std::unique_ptr<GpuMemoryTrackingGroup> tracking_group_;
   const uint64_t client_tracing_id_;
   const int client_id_;
   const uint64_t share_group_tracing_guid_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferMemoryTracker);
 };
 
 // FastSetActiveURL will shortcut the expensive call to SetActiveURL when the
 // url_hash matches.
 void FastSetActiveURL(const GURL& url, size_t url_hash, GpuChannel* channel) {
@@ skipping 16 matching lines @@
 // stubs to process some work, or else the timing of the fences could
 // allow a pattern of alternating fast and slow frames to occur.
 const int64_t kHandleMoreWorkPeriodMs = 2;
 const int64_t kHandleMoreWorkPeriodBusyMs = 1;
 
 // Prevents idle work from being starved.
 const int64_t kMaxTimeSinceIdleMs = 10;
 
 class DevToolsChannelData : public base::trace_event::ConvertableToTraceFormat {
  public:
-  static scoped_ptr<base::trace_event::ConvertableToTraceFormat>
+  static std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
   CreateForChannel(GpuChannel* channel);
   ~DevToolsChannelData() override {}
 
   void AppendAsTraceFormat(std::string* out) const override {
     std::string tmp;
     base::JSONWriter::Write(*value_, &tmp);
     *out += tmp;
   }
 
  private:
   explicit DevToolsChannelData(base::Value* value) : value_(value) {}
-  scoped_ptr<base::Value> value_;
+  std::unique_ptr<base::Value> value_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsChannelData);
 };
 
-scoped_ptr<base::trace_event::ConvertableToTraceFormat>
+std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
 DevToolsChannelData::CreateForChannel(GpuChannel* channel) {
-  scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue);
+  std::unique_ptr<base::DictionaryValue> res(new base::DictionaryValue);
   res->SetInteger("renderer_pid", channel->GetClientPID());
   res->SetDouble("used_bytes", channel->GetMemoryUsage());
-  return make_scoped_ptr(new DevToolsChannelData(res.release()));
+  return base::WrapUnique(new DevToolsChannelData(res.release()));
 }
 
 CommandBufferId GetCommandBufferID(int channel_id, int32_t route_id) {
   return CommandBufferId::FromUnsafeValue(
       (static_cast<uint64_t>(channel_id) << 32) | route_id);
 }
 
 }  // namespace
 
 GpuCommandBufferStub::GpuCommandBufferStub(
@@ skipping 357 matching lines @@
   }
   return surface;
 }
 
 void GpuCommandBufferStub::OnInitialize(
     base::SharedMemoryHandle shared_state_handle,
     IPC::Message* reply_message) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnInitialize");
   DCHECK(!command_buffer_.get());
 
-  scoped_ptr<base::SharedMemory> shared_state_shm(
+  std::unique_ptr<base::SharedMemory> shared_state_shm(
       new base::SharedMemory(shared_state_handle, false));
 
   command_buffer_.reset(new CommandBufferService(
       context_group_->transfer_buffer_manager()));
 
   bool result = command_buffer_->Initialize();
   DCHECK(result);
 
   GpuChannelManager* manager = channel_->gpu_channel_manager();
   DCHECK(manager);
@@ skipping 199 matching lines @@
 
 void GpuCommandBufferStub::OnWaitForTokenInRange(int32_t start,
                                                  int32_t end,
                                                  IPC::Message* reply_message) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnWaitForTokenInRange");
   DCHECK(command_buffer_.get());
   CheckContextLost();
   if (wait_for_token_)
     LOG(ERROR) << "Got WaitForToken command while currently waiting for token.";
   wait_for_token_ =
-      make_scoped_ptr(new WaitForCommandState(start, end, reply_message));
+      base::WrapUnique(new WaitForCommandState(start, end, reply_message));
   CheckCompleteWaits();
 }
 
 void GpuCommandBufferStub::OnWaitForGetOffsetInRange(
     int32_t start,
     int32_t end,
     IPC::Message* reply_message) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnWaitForGetOffsetInRange");
   DCHECK(command_buffer_.get());
   CheckContextLost();
   if (wait_for_get_offset_) {
     LOG(ERROR)
         << "Got WaitForGetOffset command while currently waiting for offset.";
   }
   wait_for_get_offset_ =
-      make_scoped_ptr(new WaitForCommandState(start, end, reply_message));
+      base::WrapUnique(new WaitForCommandState(start, end, reply_message));
   CheckCompleteWaits();
 }
 
 void GpuCommandBufferStub::CheckCompleteWaits() {
   if (wait_for_token_ || wait_for_get_offset_) {
     CommandBuffer::State state = command_buffer_->GetLastState();
     if (wait_for_token_ &&
         (CommandBuffer::InRange(
              wait_for_token_->start, wait_for_token_->end, state.token) ||
          state.error != error::kNoError)) {
@@ skipping 52 matching lines @@
 }
 
 void GpuCommandBufferStub::OnRegisterTransferBuffer(
     int32_t id,
     base::SharedMemoryHandle transfer_buffer,
     uint32_t size) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnRegisterTransferBuffer");
 
   // Take ownership of the memory and map it into this process.
   // This validates the size.
-  scoped_ptr<base::SharedMemory> shared_memory(
+  std::unique_ptr<base::SharedMemory> shared_memory(
       new base::SharedMemory(transfer_buffer, false));
   if (!shared_memory->Map(size)) {
     DVLOG(0) << "Failed to map shared memory.";
     return;
   }
 
   if (command_buffer_) {
     command_buffer_->RegisterTransferBuffer(
         id, MakeBackingFromSharedMemory(std::move(shared_memory), size));
   }
@@ skipping 277 matching lines @@
                                                     result));
 }
 
 void GpuCommandBufferStub::SendUpdateVSyncParameters(base::TimeTicks timebase,
                                                      base::TimeDelta interval) {
   Send(new GpuCommandBufferMsg_UpdateVSyncParameters(route_id_, timebase,
                                                      interval));
 }
 
 }  // namespace gpu