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

cc/surfaces/display.cc

 // Copyright 2014 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/surfaces/display.h"
 
 #include <stddef.h>
 
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 36 matching lines @@
   manager_->RemoveObserver(this);
   if (aggregator_) {
     for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
       Surface* surface = manager_->GetSurfaceForId(id_entry.first);
       if (surface)
         surface->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED);
     }
   }
 }
 
-bool Display::Initialize(scoped_ptr<OutputSurface> output_surface,
+bool Display::Initialize(std::unique_ptr<OutputSurface> output_surface,
                          DisplayScheduler* scheduler) {
   // TODO(enne): register/unregister BeginFrameSource with SurfaceManager here.
   output_surface_ = std::move(output_surface);
   scheduler_ = scheduler;
   return output_surface_->BindToClient(this);
 }
 
 void Display::SetSurfaceId(SurfaceId id, float device_scale_factor) {
   if (current_surface_id_ == id && device_scale_factor_ == device_scale_factor)
     return;
@@ skipping 30 matching lines @@
 }
 
 void Display::SetExternalClip(const gfx::Rect& clip) {
   external_clip_ = clip;
 }
 
 void Display::InitializeRenderer() {
   if (resource_provider_)
     return;
 
-  scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
-      output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
-      nullptr, settings_.highp_threshold_min,
-      settings_.texture_id_allocation_chunk_size,
-      settings_.use_gpu_memory_buffer_resources,
-      std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
-                            GL_TEXTURE_2D));
+  std::unique_ptr<ResourceProvider> resource_provider =
+      ResourceProvider::Create(
+          output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
+          nullptr, settings_.highp_threshold_min,
+          settings_.texture_id_allocation_chunk_size,
+          settings_.use_gpu_memory_buffer_resources,
+          std::vector<unsigned>(
+              static_cast<size_t>(gfx::BufferFormat::LAST) + 1, GL_TEXTURE_2D));
   if (!resource_provider)
     return;
 
   if (output_surface_->context_provider()) {
-    scoped_ptr<GLRenderer> renderer = GLRenderer::Create(
+    std::unique_ptr<GLRenderer> renderer = GLRenderer::Create(
         this, &settings_, output_surface_.get(), resource_provider.get(),
         texture_mailbox_deleter_.get(), settings_.highp_threshold_min);
     if (!renderer)
       return;
     renderer_ = std::move(renderer);
   } else {
-    scoped_ptr<SoftwareRenderer> renderer = SoftwareRenderer::Create(
+    std::unique_ptr<SoftwareRenderer> renderer = SoftwareRenderer::Create(
         this, &settings_, output_surface_.get(), resource_provider.get());
     if (!renderer)
       return;
     renderer_ = std::move(renderer);
   }
 
   resource_provider_ = std::move(resource_provider);
   // TODO(jbauman): Outputting an incomplete quad list doesn't work when using
   // overlays.
   bool output_partial_list = renderer_->Capabilities().using_partial_swap &&
@@ skipping 24 matching lines @@
     TRACE_EVENT_INSTANT0("cc", "No root surface.", TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
 
   InitializeRenderer();
   if (!output_surface_) {
     TRACE_EVENT_INSTANT0("cc", "No output surface", TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
 
-  scoped_ptr<CompositorFrame> frame =
+  std::unique_ptr<CompositorFrame> frame =
       aggregator_->Aggregate(current_surface_id_);
   if (!frame) {
     TRACE_EVENT_INSTANT0("cc", "Empty aggregated frame.",
                          TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
 
   // Run callbacks early to allow pipelining.
   for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
     Surface* surface = manager_->GetSurfaceForId(id_entry.first);
@@ skipping 157 matching lines @@
 
   if (surface_id == current_surface_id_)
     UpdateRootSurfaceResourcesLocked();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc