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

cc/trees/threaded_channel.cc

 // Copyright 2015 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/threaded_channel.h"
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/animation/animation_events.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
-scoped_ptr<ThreadedChannel> ThreadedChannel::Create(
+std::unique_ptr<ThreadedChannel> ThreadedChannel::Create(
     ProxyMain* proxy_main,
     TaskRunnerProvider* task_runner_provider) {
-  return make_scoped_ptr(new ThreadedChannel(proxy_main, task_runner_provider));
+  return base::WrapUnique(
+      new ThreadedChannel(proxy_main, task_runner_provider));
 }
 
 ThreadedChannel::ThreadedChannel(ProxyMain* proxy_main,
                                  TaskRunnerProvider* task_runner_provider)
     : task_runner_provider_(task_runner_provider),
       main_thread_only_vars_unsafe_(proxy_main),
       compositor_thread_vars_unsafe_(
           main()
               .proxy_main_weak_factory.GetWeakPtr()) {
   DCHECK(IsMainThread());
@@ skipping 105 matching lines @@
                                         bool hold_commit_for_activation) {
   DCHECK(IsMainThread());
   ImplThreadTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&ProxyImpl::StartCommitOnImpl, proxy_impl_weak_ptr_,
                             completion, layer_tree_host, main_thread_start_time,
                             hold_commit_for_activation));
 }
 
 void ThreadedChannel::SynchronouslyInitializeImpl(
     LayerTreeHost* layer_tree_host,
-    scoped_ptr<BeginFrameSource> external_begin_frame_source) {
+    std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   TRACE_EVENT0("cc", "ThreadChannel::SynchronouslyInitializeImpl");
   DCHECK(IsMainThread());
   {
     DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_);
     CompletionEvent completion;
     ImplThreadTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&ThreadedChannel::InitializeImplOnImpl,
                    base::Unretained(this), &completion, layer_tree_host,
                    base::Passed(&external_begin_frame_source)));
@@ skipping 52 matching lines @@
                             impl().proxy_main_weak_ptr));
 }
 
 void ThreadedChannel::DidCommitAndDrawFrame() {
   DCHECK(IsImplThread());
   MainThreadTaskRunner()->PostTask(FROM_HERE,
                                    base::Bind(&ProxyMain::DidCommitAndDrawFrame,
                                               impl().proxy_main_weak_ptr));
 }
 
-void ThreadedChannel::SetAnimationEvents(scoped_ptr<AnimationEvents> events) {
+void ThreadedChannel::SetAnimationEvents(
+    std::unique_ptr<AnimationEvents> events) {
   DCHECK(IsImplThread());
   MainThreadTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&ProxyMain::SetAnimationEvents,
                             impl().proxy_main_weak_ptr, base::Passed(&events)));
 }
 
 void ThreadedChannel::DidLoseOutputSurface() {
   DCHECK(IsImplThread());
   MainThreadTaskRunner()->PostTask(
       FROM_HERE,
@@ skipping 17 matching lines @@
 }
 
 void ThreadedChannel::DidCompletePageScaleAnimation() {
   DCHECK(IsImplThread());
   MainThreadTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&ProxyMain::DidCompletePageScaleAnimation,
                             impl().proxy_main_weak_ptr));
 }
 
 void ThreadedChannel::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) {
   DCHECK(IsImplThread());
   MainThreadTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&ProxyMain::PostFrameTimingEventsOnMain,
                             impl().proxy_main_weak_ptr,
                             base::Passed(std::move(composite_events)),
                             base::Passed(std::move(main_frame_events))));
 }
 
 void ThreadedChannel::BeginMainFrame(
-    scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) {
+    std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) {
   DCHECK(IsImplThread());
   MainThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ProxyMain::BeginMainFrame, impl().proxy_main_weak_ptr,
                  base::Passed(&begin_main_frame_state)));
 }
 
-scoped_ptr<ProxyImpl> ThreadedChannel::CreateProxyImpl(
+std::unique_ptr<ProxyImpl> ThreadedChannel::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(IsImplThread());
   return ProxyImpl::Create(channel_impl, layer_tree_host, task_runner_provider,
                            std::move(external_begin_frame_source));
 }
 
 void ThreadedChannel::InitializeImplOnImpl(
     CompletionEvent* completion,
     LayerTreeHost* layer_tree_host,
-    scoped_ptr<BeginFrameSource> external_begin_frame_source) {
+    std::unique_ptr<BeginFrameSource> external_begin_frame_source) {
   DCHECK(IsImplThread());
   impl().proxy_impl =
       CreateProxyImpl(this, layer_tree_host, task_runner_provider_,
                       std::move(external_begin_frame_source));
-  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 ThreadedChannel::CloseImplOnImpl(CompletionEvent* completion) {
   DCHECK(IsImplThread());
 
   // We must destroy the factory and ensure that the ProxyImpl weak pointers are
   // invalidated before destroying proxy_impl.
@@ skipping 48 matching lines @@
 
 ThreadedChannel::MainThreadOnly::~MainThreadOnly() {}
 
 ThreadedChannel::CompositorThreadOnly::CompositorThreadOnly(
     base::WeakPtr<ProxyMain> proxy_main_weak_ptr)
     : proxy_main_weak_ptr(proxy_main_weak_ptr) {}
 
 ThreadedChannel::CompositorThreadOnly::~CompositorThreadOnly() {}
 
 }  // namespace cc