ui: Cleanup the usage of scoped_ptr throughout.

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 4b44c255e0e3fa63b25f3b06476e9c9da9d983b6..29f8178c4bcceaf7f089c79e07c83f1fcc18470a 100644
--- a/ui/ozone/demo/ozone_demo.cc
+++ b/ui/ozone/demo/ozone_demo.cc
@@ -217,12 +217,12 @@ scoped_ptr<ui::Renderer> RendererFactory::CreateRenderer(
     const gfx::Size& size) {
   switch (type_) {
     case GL:
-      return scoped_ptr<ui::Renderer>(new ui::GlRenderer(widget, size));
+      return make_scoped_ptr(new ui::GlRenderer(widget, size));
     case SURFACELESS_GL:
-      return scoped_ptr<ui::Renderer>(
+      return make_scoped_ptr(
           new ui::SurfacelessGlRenderer(widget, size, &buffer_factory_));
     case SOFTWARE:
-      return scoped_ptr<ui::Renderer>(new ui::SoftwareRenderer(widget, size));
+      return make_scoped_ptr(new ui::SoftwareRenderer(widget, size));
   }
 
   return nullptr;