Replace scoped_ptr with std::unique_ptr in //ui

ui/ozone/platform/wayland/ozone_platform_wayland.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/wayland/ozone_platform_wayland.h"
 
+#include "base/memory/ptr_util.h"
 #include "ui/ozone/common/native_display_delegate_ozone.h"
 #include "ui/ozone/common/stub_overlay_manager.h"
 #include "ui/ozone/platform/wayland/wayland_display.h"
 #include "ui/ozone/platform/wayland/wayland_surface_factory.h"
 #include "ui/ozone/platform/wayland/wayland_window.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/ozone/public/gpu_platform_support.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
 #include "ui/ozone/public/input_controller.h"
 #include "ui/ozone/public/ozone_platform.h"
@@ skipping 26 matching lines @@
   }
 
   GpuPlatformSupport* GetGpuPlatformSupport() override {
     return gpu_platform_support_.get();
   }
 
   GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
     return gpu_platform_support_host_.get();
   }
 
-  scoped_ptr<SystemInputInjector> CreateSystemInputInjector() override {
+  std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() override {
     return nullptr;
   }
 
-  scoped_ptr<PlatformWindow> CreatePlatformWindow(
+  std::unique_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override {
     auto window =
-        make_scoped_ptr(new WaylandWindow(delegate, display_.get(), bounds));
+        base::WrapUnique(new WaylandWindow(delegate, display_.get(), bounds));
     if (!window->Initialize())
       return nullptr;
     return std::move(window);
   }
 
-  scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
-    return make_scoped_ptr(new NativeDisplayDelegateOzone);
+  std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
+      override {
+    return base::WrapUnique(new NativeDisplayDelegateOzone);
   }
 
   void InitializeUI() override {
     display_.reset(new WaylandDisplay);
     if (!display_->Initialize())
       LOG(FATAL) << "Failed to initialize Wayland platform";
 
     cursor_factory_.reset(new CursorFactoryOzone);
     overlay_manager_.reset(new StubOverlayManager);
     input_controller_ = CreateStubInputController();
     surface_factory_.reset(new WaylandSurfaceFactory(display_.get()));
     gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
   }
 
   void InitializeGPU() override {
     // Don't reinitialize the surface factory in case InitializeUI was called
     // previously in the same process.
     if (!surface_factory_)
       surface_factory_.reset(new WaylandSurfaceFactory(nullptr));
     gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
   }
 
  private:
-  scoped_ptr<WaylandDisplay> display_;
-  scoped_ptr<WaylandSurfaceFactory> surface_factory_;
-  scoped_ptr<CursorFactoryOzone> cursor_factory_;
-  scoped_ptr<StubOverlayManager> overlay_manager_;
-  scoped_ptr<InputController> input_controller_;
-  scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
-  scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
+  std::unique_ptr<WaylandDisplay> display_;
+  std::unique_ptr<WaylandSurfaceFactory> surface_factory_;
+  std::unique_ptr<CursorFactoryOzone> cursor_factory_;
+  std::unique_ptr<StubOverlayManager> overlay_manager_;
+  std::unique_ptr<InputController> input_controller_;
+  std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
+  std::unique_ptr<GpuPlatformSupport> gpu_platform_support_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformWayland);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformWayland() {
   return new OzonePlatformWayland;
 }
 
 }  // namespace ui