Replace scoped_ptr with std::unique_ptr in //ui

ui/ozone/platform/headless/headless_surface_factory.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 "ui/ozone/platform/headless/headless_surface_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/threading/worker_pool.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/platform/headless/headless_window.h"
 #include "ui/ozone/platform/headless/headless_window_manager.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
@@ skipping 28 matching lines @@
     SkBitmap bitmap;
     bitmap.setInfo(surface_->getCanvas()->imageInfo());
 
     // TODO(dnicoara) Use SkImage instead to potentially avoid a copy.
     // See crbug.com/361605 for details.
     if (surface_->getCanvas()->readPixels(&bitmap, 0, 0)) {
       base::WorkerPool::PostTask(
           FROM_HERE, base::Bind(&WriteDataToFile, location_, bitmap), true);
     }
   }
-  scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
+  std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
     return nullptr;
   }
 
  private:
   base::FilePath location_;
   sk_sp<SkSurface> surface_;
 };
 
 class TestPixmap : public ui::NativePixmap {
  public:
@@ skipping 29 matching lines @@
 
 HeadlessSurfaceFactory::HeadlessSurfaceFactory()
     : HeadlessSurfaceFactory(nullptr) {}
 
 HeadlessSurfaceFactory::HeadlessSurfaceFactory(
     HeadlessWindowManager* window_manager)
     : window_manager_(window_manager) {}
 
 HeadlessSurfaceFactory::~HeadlessSurfaceFactory() {}
 
-scoped_ptr<SurfaceOzoneCanvas> HeadlessSurfaceFactory::CreateCanvasForWidget(
-    gfx::AcceleratedWidget widget) {
+std::unique_ptr<SurfaceOzoneCanvas>
+HeadlessSurfaceFactory::CreateCanvasForWidget(gfx::AcceleratedWidget widget) {
   HeadlessWindow* window = window_manager_->GetWindow(widget);
-  return make_scoped_ptr<SurfaceOzoneCanvas>(new FileSurface(window->path()));
+  return base::WrapUnique<SurfaceOzoneCanvas>(new FileSurface(window->path()));
 }
 
 bool HeadlessSurfaceFactory::LoadEGLGLES2Bindings(
     AddGLLibraryCallback add_gl_library,
     SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return false;
 }
 
 scoped_refptr<NativePixmap> HeadlessSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
   return new TestPixmap(format);
 }
 
 }  // namespace ui