Replace scoped_ptr with std::unique_ptr in //ui

ui/ozone/demo/ozone_demo.cc

Index: ui/ozone/demo/ozone_demo.cc
diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc
index 151c2803e612899f4e4d60a86f7b49d3b5ee1af1..ba3b44a28dbcdc7db68f26e1ac059e7003196738 100644
--- a/ui/ozone/demo/ozone_demo.cc
+++ b/ui/ozone/demo/ozone_demo.cc
@@ -7,6 +7,7 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ -61,8 +62,8 @@ class RendererFactory {
   ~RendererFactory();
 
   bool Initialize();
-  scoped_ptr<ui::Renderer> CreateRenderer(gfx::AcceleratedWidget widget,
-                                          const gfx::Size& size);
+  std::unique_ptr<ui::Renderer> CreateRenderer(gfx::AcceleratedWidget widget,
+                                               const gfx::Size& size);
 
  private:
   RendererType type_ = SOFTWARE;
@@ -90,10 +91,10 @@ class WindowManager : public ui::NativeDisplayObserver {
   // ui::NativeDisplayDelegate:
   void OnConfigurationChanged() override;
 
-  scoped_ptr<ui::NativeDisplayDelegate> delegate_;
+  std::unique_ptr<ui::NativeDisplayDelegate> delegate_;
   base::Closure quit_closure_;
   RendererFactory renderer_factory_;
-  std::vector<scoped_ptr<DemoWindow>> windows_;
+  std::vector<std::unique_ptr<DemoWindow>> windows_;
 
   // Flags used to keep track of the current state of display configuration.
   //
@@ -174,10 +175,10 @@ class DemoWindow : public ui::PlatformWindowDelegate {
   WindowManager* window_manager_;      // Not owned.
   RendererFactory* renderer_factory_;  // Not owned.
 
-  scoped_ptr<ui::Renderer> renderer_;
+  std::unique_ptr<ui::Renderer> renderer_;
 
   // Window-related state.
-  scoped_ptr<ui::PlatformWindow> platform_window_;
+  std::unique_ptr<ui::PlatformWindow> platform_window_;
   gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
 
   base::WeakPtrFactory<DemoWindow> weak_ptr_factory_;
@@ -208,7 +209,7 @@ bool RendererFactory::Initialize() {
   return true;
 }
 
-scoped_ptr<ui::Renderer> RendererFactory::CreateRenderer(
+std::unique_ptr<ui::Renderer> RendererFactory::CreateRenderer(
     gfx::AcceleratedWidget widget,
     const gfx::Size& size) {
   switch (type_) {
@@ -217,13 +218,13 @@ scoped_ptr<ui::Renderer> RendererFactory::CreateRenderer(
       if (!surface)
         LOG(FATAL) << "Failed to create GL surface";
       if (surface->IsSurfaceless())
-        return make_scoped_ptr(
+        return base::WrapUnique(
             new ui::SurfacelessGlRenderer(widget, surface, size));
       else
-        return make_scoped_ptr(new ui::GlRenderer(widget, surface, size));
+        return base::WrapUnique(new ui::GlRenderer(widget, surface, size));
     }
     case SOFTWARE:
-      return make_scoped_ptr(new ui::SoftwareRenderer(widget, size));
+      return base::WrapUnique(new ui::SoftwareRenderer(widget, size));
   }
 
   return nullptr;
@@ -310,7 +311,7 @@ void WindowManager::OnDisplaysAquired(
 
 void WindowManager::OnDisplayConfigured(const gfx::Rect& bounds, bool success) {
   if (success) {
-    scoped_ptr<DemoWindow> window(
+    std::unique_ptr<DemoWindow> window(
         new DemoWindow(this, &renderer_factory_, bounds));
     window->Start();
     windows_.push_back(std::move(window));