Replace scoped_ptr with std::unique_ptr in //ui

ui/ozone/platform/x11/x11_surface_factory.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 "ui/ozone/platform/x11/x11_surface_factory.h"
 
 #include <X11/Xlib.h>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "third_party/khronos/EGL/egl.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/ozone/common/egl_util.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 
 namespace {
 
 class X11SurfaceEGL : public SurfaceOzoneEGL {
  public:
   explicit X11SurfaceEGL(gfx::AcceleratedWidget widget) : widget_(widget) {}
   ~X11SurfaceEGL() override {}
 
   intptr_t GetNativeWindow() override { return widget_; }
 
   bool OnSwapBuffers() override { return true; }
 
   void OnSwapBuffersAsync(const SwapCompletionCallback& callback) override {
     NOTREACHED();
   }
 
   bool ResizeNativeWindow(const gfx::Size& viewport_size) override {
     return true;
   }
 
-  scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
+  std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override {
     return nullptr;
   }
 
   void* /* EGLConfig */ GetEGLSurfaceConfig(
       const EglConfigCallbacks& egl) override;
 
  private:
   gfx::AcceleratedWidget widget_;
 
   DISALLOW_COPY_AND_ASSIGN(X11SurfaceEGL);
@@ skipping 60 matching lines @@
   }
   return config;
 }
 
 }  // namespace
 
 X11SurfaceFactory::X11SurfaceFactory() {}
 
 X11SurfaceFactory::~X11SurfaceFactory() {}
 
-scoped_ptr<SurfaceOzoneEGL> X11SurfaceFactory::CreateEGLSurfaceForWidget(
+std::unique_ptr<SurfaceOzoneEGL> X11SurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
-  return make_scoped_ptr(new X11SurfaceEGL(widget));
+  return base::WrapUnique(new X11SurfaceEGL(widget));
 }
 
 bool X11SurfaceFactory::LoadEGLGLES2Bindings(
     AddGLLibraryCallback add_gl_library,
     SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address);
 }
 
 intptr_t X11SurfaceFactory::GetNativeDisplay() {
   return reinterpret_cast<intptr_t>(gfx::GetXDisplay());
 }
 
 }  // namespace ui