Index: gpu/ipc/service/gpu_channel_manager.cc |
diff --git a/gpu/ipc/service/gpu_channel_manager.cc b/gpu/ipc/service/gpu_channel_manager.cc |
index 015ca333d9d40b2446d778db3ef4d74c94720f20..a64dfca648786088d8f87b89d60b4c094ed20e0d 100644 |
--- a/gpu/ipc/service/gpu_channel_manager.cc |
+++ b/gpu/ipc/service/gpu_channel_manager.cc |
@@ -10,6 +10,7 @@ |
#include "base/bind.h" |
#include "base/command_line.h" |
#include "base/location.h" |
+#include "base/memory/ptr_util.h" |
#include "base/single_thread_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
#include "build/build_config.h" |
@@ -144,13 +145,13 @@ GpuChannel* GpuChannelManager::LookupChannel(int32_t client_id) const { |
return it != gpu_channels_.end() ? it->second : nullptr; |
} |
-scoped_ptr<GpuChannel> GpuChannelManager::CreateGpuChannel( |
+std::unique_ptr<GpuChannel> GpuChannelManager::CreateGpuChannel( |
int client_id, |
uint64_t client_tracing_id, |
bool preempts, |
bool allow_view_command_buffers, |
bool allow_real_time_streams) { |
- return make_scoped_ptr( |
+ return base::WrapUnique( |
new GpuChannel(this, sync_point_manager(), watchdog_, share_group(), |
mailbox_manager(), preempts ? preemption_flag() : nullptr, |
preempts ? nullptr : preemption_flag(), task_runner_.get(), |
@@ -164,7 +165,7 @@ IPC::ChannelHandle GpuChannelManager::EstablishChannel( |
bool preempts, |
bool allow_view_command_buffers, |
bool allow_real_time_streams) { |
- scoped_ptr<GpuChannel> channel( |
+ std::unique_ptr<GpuChannel> channel( |
CreateGpuChannel(client_id, client_tracing_id, preempts, |
allow_view_command_buffers, allow_real_time_streams)); |
IPC::ChannelHandle channel_handle = channel->Init(shutdown_event_); |