ui: Cleanup the usage of scoped_ptr throughout.

ui/ozone/demo/ozone_demo.cc

 // Copyright 2014 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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 199 matching lines @@
   }
 
   return true;
 }
 
 scoped_ptr<ui::Renderer> RendererFactory::CreateRenderer(
     gfx::AcceleratedWidget widget,
     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;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowManager implementation:
 
 WindowManager::WindowManager(const base::Closure& quit_closure)
     : delegate_(
@@ skipping 101 matching lines @@
       ->SetCurrentLayoutByName("us");
 
   base::RunLoop run_loop;
 
   WindowManager window_manager(run_loop.QuitClosure());
 
   run_loop.Run();
 
   return 0;
 }