Convert //cc from scoped_ptr to std::unique_ptr.

cc/trees/remote_channel_impl.cc

 // Copyright 2016 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 "cc/trees/remote_channel_impl.h"
 
 #include "base/bind_helpers.h"
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/animation/animation_events.h"
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/proto/compositor_message_to_impl.pb.h"
 #include "cc/proto/compositor_message_to_main.pb.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_settings.h"
 
 namespace cc {
 
-scoped_ptr<RemoteChannelImpl> RemoteChannelImpl::Create(
+std::unique_ptr<RemoteChannelImpl> RemoteChannelImpl::Create(
     LayerTreeHost* layer_tree_host,
     RemoteProtoChannel* remote_proto_channel,
     TaskRunnerProvider* task_runner_provider) {
-  return make_scoped_ptr(new RemoteChannelImpl(
+  return base::WrapUnique(new RemoteChannelImpl(
       layer_tree_host, remote_proto_channel, task_runner_provider));
 }
 
 RemoteChannelImpl::RemoteChannelImpl(LayerTreeHost* layer_tree_host,
                                      RemoteProtoChannel* remote_proto_channel,
                                      TaskRunnerProvider* task_runner_provider)
     : task_runner_provider_(task_runner_provider),
       main_thread_vars_unsafe_(this, layer_tree_host, remote_proto_channel),
       compositor_thread_vars_unsafe_(
           main().remote_channel_weak_factory.GetWeakPtr()) {
   DCHECK(task_runner_provider_->IsMainThread());
 
   main().remote_proto_channel->SetProtoReceiver(this);
 }
 
 RemoteChannelImpl::~RemoteChannelImpl() {
   DCHECK(task_runner_provider_->IsMainThread());
   DCHECK(!main().started);
 
   main().remote_proto_channel->SetProtoReceiver(nullptr);
 }
 
-scoped_ptr<ProxyImpl> RemoteChannelImpl::CreateProxyImpl(
+std::unique_ptr<ProxyImpl> RemoteChannelImpl::CreateProxyImpl(
     ChannelImpl* channel_impl,
     LayerTreeHost* layer_tree_host,
     TaskRunnerProvider* task_runner_provider,
-    scoped_ptr<BeginFrameSource> external_begin_frame_source) {
+    std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   DCHECK(task_runner_provider_->IsImplThread());
   DCHECK(!external_begin_frame_source);
   return ProxyImpl::Create(channel_impl, layer_tree_host, task_runner_provider,
                            std::move(external_begin_frame_source));
 }
 
 void RemoteChannelImpl::OnProtoReceived(
-    scoped_ptr<proto::CompositorMessage> proto) {
+    std::unique_ptr<proto::CompositorMessage> proto) {
   DCHECK(task_runner_provider_->IsMainThread());
   DCHECK(main().started);
   DCHECK(proto->has_to_impl());
 
   // If we don't have an output surface, queue the message and defer processing
   // it till we initialize a new output surface.
   if (main().waiting_for_output_surface_initialization) {
     VLOG(1) << "Queueing message proto since output surface was released.";
     main().pending_messages.push(proto->to_impl());
   } else {
@@ skipping 177 matching lines @@
   NOTREACHED() << "Should not be called on the remote client LayerTreeHost";
   return false;
 }
 
 bool RemoteChannelImpl::BeginMainFrameRequested() const {
   NOTREACHED() << "Should not be called on the remote client LayerTreeHost";
   return false;
 }
 
 void RemoteChannelImpl::Start(
-    scoped_ptr<BeginFrameSource> external_begin_frame_source) {
+    std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   DCHECK(task_runner_provider_->IsMainThread());
   DCHECK(!main().started);
   DCHECK(!external_begin_frame_source);
 
   CompletionEvent completion;
   {
     DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_);
     ImplThreadTaskRunner()->PostTask(
         FROM_HERE, base::Bind(&RemoteChannelImpl::InitializeImplOnImpl,
                               base::Unretained(this), &completion,
@@ skipping 69 matching lines @@
 
 void RemoteChannelImpl::DidCompleteSwapBuffers() {}
 
 void RemoteChannelImpl::SetRendererCapabilitiesMainCopy(
     const RendererCapabilities& capabilities) {}
 
 void RemoteChannelImpl::BeginMainFrameNotExpectedSoon() {}
 
 void RemoteChannelImpl::DidCommitAndDrawFrame() {}
 
-void RemoteChannelImpl::SetAnimationEvents(scoped_ptr<AnimationEvents> queue) {}
+void RemoteChannelImpl::SetAnimationEvents(
+    std::unique_ptr<AnimationEvents> queue) {}
 
 void RemoteChannelImpl::DidLoseOutputSurface() {
   DCHECK(task_runner_provider_->IsImplThread());
 
   MainThreadTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&RemoteChannelImpl::DidLoseOutputSurfaceOnMain,
                             impl().remote_channel_weak_ptr));
 }
 
 void RemoteChannelImpl::RequestNewOutputSurface() {
@@ skipping 11 matching lines @@
 
   MainThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&RemoteChannelImpl::DidInitializeOutputSurfaceOnMain,
                  impl().remote_channel_weak_ptr, success, capabilities));
 }
 
 void RemoteChannelImpl::DidCompletePageScaleAnimation() {}
 
 void RemoteChannelImpl::PostFrameTimingEventsOnMain(
-    scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
-    scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) {}
+    std::unique_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
+    std::unique_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) {
+}
 
 void RemoteChannelImpl::BeginMainFrame(
-    scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) {
-  scoped_ptr<proto::CompositorMessage> proto;
+    std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) {
+  std::unique_ptr<proto::CompositorMessage> proto;
   proto.reset(new proto::CompositorMessage);
   proto::CompositorMessageToMain* to_main_proto = proto->mutable_to_main();
 
   to_main_proto->set_message_type(
       proto::CompositorMessageToMain::BEGIN_MAIN_FRAME);
   proto::BeginMainFrame* begin_main_frame_message =
       to_main_proto->mutable_begin_main_frame_message();
   begin_main_frame_state->ToProtobuf(
       begin_main_frame_message->mutable_begin_main_frame_state());
 
   SendMessageProto(std::move(proto));
 }
 
 void RemoteChannelImpl::SendMessageProto(
-    scoped_ptr<proto::CompositorMessage> proto) {
+    std::unique_ptr<proto::CompositorMessage> proto) {
   DCHECK(task_runner_provider_->IsImplThread());
 
   MainThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&RemoteChannelImpl::SendMessageProtoOnMain,
                  impl().remote_channel_weak_ptr, base::Passed(&proto)));
 }
 
 void RemoteChannelImpl::DidLoseOutputSurfaceOnMain() {
   DCHECK(task_runner_provider_->IsMainThread());
@@ skipping 31 matching lines @@
     main().pending_messages.pop();
   }
 
   // The commit after a new output surface can early out, in which case we will
   // never redraw. Schedule one just to be safe.
   PostSetNeedsRedrawToImpl(
       gfx::Rect(main().layer_tree_host->device_viewport_size()));
 }
 
 void RemoteChannelImpl::SendMessageProtoOnMain(
-    scoped_ptr<proto::CompositorMessage> proto) {
+    std::unique_ptr<proto::CompositorMessage> proto) {
   DCHECK(task_runner_provider_->IsMainThread());
   VLOG(1) << "Sending BeginMainFrame request to the engine.";
 
   main().remote_proto_channel->SendCompositorProto(*proto);
 }
 
 void RemoteChannelImpl::PostSetNeedsRedrawToImpl(
     const gfx::Rect& damaged_rect) {
   DCHECK(task_runner_provider_->IsMainThread());
 
   ImplThreadTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&ProxyImpl::SetNeedsRedrawOnImpl,
                             proxy_impl_weak_ptr_, damaged_rect));
 }
 
 void RemoteChannelImpl::InitializeImplOnImpl(CompletionEvent* completion,
                                              LayerTreeHost* layer_tree_host) {
   DCHECK(task_runner_provider_->IsMainThreadBlocked());
   DCHECK(task_runner_provider_->IsImplThread());
 
   impl().proxy_impl =
       CreateProxyImpl(this, layer_tree_host, task_runner_provider_, nullptr);
-  impl().proxy_impl_weak_factory = make_scoped_ptr(
+  impl().proxy_impl_weak_factory = base::WrapUnique(
       new base::WeakPtrFactory<ProxyImpl>(impl().proxy_impl.get()));
   proxy_impl_weak_ptr_ = impl().proxy_impl_weak_factory->GetWeakPtr();
   completion->Signal();
 }
 
 void RemoteChannelImpl::ShutdownImplOnImpl(CompletionEvent* completion) {
   DCHECK(task_runner_provider_->IsMainThreadBlocked());
   DCHECK(task_runner_provider_->IsImplThread());
 
   // We must invalidate the proxy_impl weak ptrs and destroy the weak ptr
@@ skipping 50 matching lines @@
 
 RemoteChannelImpl::CompositorThreadOnly::CompositorThreadOnly(
     base::WeakPtr<RemoteChannelImpl> remote_channel_weak_ptr)
     : proxy_impl(nullptr),
       proxy_impl_weak_factory(nullptr),
       remote_channel_weak_ptr(remote_channel_weak_ptr) {}
 
 RemoteChannelImpl::CompositorThreadOnly::~CompositorThreadOnly() {}
 
 }  // namespace cc