Replace scoped_ptr with std::unique_ptr in //ui

ui/compositor/test/in_process_context_factory.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 "ui/compositor/test/in_process_context_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/threading/thread.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface_display_output_surface.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/test/pixel_test_output_surface.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "gpu/command_buffer/client/context_support.h"
@@ skipping 110 matching lines @@
   attribs.samples = 0;
   attribs.sample_buffers = 0;
   attribs.fail_if_major_perf_caveat = false;
   attribs.bind_generates_resource = false;
   scoped_refptr<InProcessContextProvider> context_provider =
       InProcessContextProvider::Create(
           attribs, shared_worker_context_provider_.get(),
           &gpu_memory_buffer_manager_, &image_factory_, compositor->widget(),
           "UICompositor");
 
-  scoped_ptr<cc::OutputSurface> real_output_surface;
+  std::unique_ptr<cc::OutputSurface> real_output_surface;
 
   if (use_test_surface_) {
     bool flipped_output_surface = false;
-    real_output_surface = make_scoped_ptr(new cc::PixelTestOutputSurface(
+    real_output_surface = base::WrapUnique(new cc::PixelTestOutputSurface(
         context_provider, shared_worker_context_provider_,
         flipped_output_surface));
   } else {
-    real_output_surface = make_scoped_ptr(new DirectOutputSurface(
+    real_output_surface = base::WrapUnique(new DirectOutputSurface(
         context_provider, shared_worker_context_provider_));
   }
 
   if (surface_manager_) {
-    scoped_ptr<cc::OnscreenDisplayClient> display_client(
+    std::unique_ptr<cc::OnscreenDisplayClient> display_client(
         new cc::OnscreenDisplayClient(
             std::move(real_output_surface), surface_manager_,
             GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
             compositor->GetRendererSettings(), compositor->task_runner()));
-    scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
+    std::unique_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
         new cc::SurfaceDisplayOutputSurface(
             surface_manager_, compositor->surface_id_allocator(),
             context_provider, shared_worker_context_provider_));
     display_client->set_surface_output_surface(surface_output_surface.get());
     surface_output_surface->set_display_client(display_client.get());
 
     compositor->SetOutputSurface(std::move(surface_output_surface));
 
     delete per_compositor_data_[compositor.get()];
     per_compositor_data_[compositor.get()] = display_client.release();
   } else {
     compositor->SetOutputSurface(std::move(real_output_surface));
   }
 }
 
-scoped_ptr<Reflector> InProcessContextFactory::CreateReflector(
+std::unique_ptr<Reflector> InProcessContextFactory::CreateReflector(
     Compositor* mirrored_compositor,
     Layer* mirroring_layer) {
-  return make_scoped_ptr(new FakeReflector);
+  return base::WrapUnique(new FakeReflector);
 }
 
 void InProcessContextFactory::RemoveReflector(Reflector* reflector) {
 }
 
 scoped_refptr<cc::ContextProvider>
 InProcessContextFactory::SharedMainThreadContextProvider() {
   if (shared_main_thread_contexts_ &&
       shared_main_thread_contexts_->ContextGL()->GetGraphicsResetStatusKHR() ==
           GL_NO_ERROR)
@@ skipping 31 matching lines @@
 
 gpu::GpuMemoryBufferManager*
 InProcessContextFactory::GetGpuMemoryBufferManager() {
   return &gpu_memory_buffer_manager_;
 }
 
 cc::TaskGraphRunner* InProcessContextFactory::GetTaskGraphRunner() {
   return &task_graph_runner_;
 }
 
-scoped_ptr<cc::SurfaceIdAllocator>
+std::unique_ptr<cc::SurfaceIdAllocator>
 InProcessContextFactory::CreateSurfaceIdAllocator() {
-  scoped_ptr<cc::SurfaceIdAllocator> allocator(
+  std::unique_ptr<cc::SurfaceIdAllocator> allocator(
       new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
   if (surface_manager_)
     allocator->RegisterSurfaceIdNamespace(surface_manager_);
   return allocator;
 }
 
 void InProcessContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                             const gfx::Size& size) {
   if (!per_compositor_data_.count(compositor))
     return;
   per_compositor_data_[compositor]->display()->Resize(size);
 }
 
 }  // namespace ui