Re-write many calls to WrapUnique() with MakeUnique()

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 <utility>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 200 matching lines @@
 
 std::unique_ptr<ui::Renderer> RendererFactory::CreateRenderer(
     gfx::AcceleratedWidget widget,
     const gfx::Size& size) {
   switch (type_) {
     case GL: {
       scoped_refptr<gl::GLSurface> surface = CreateGLSurface(widget);
       if (!surface)
         LOG(FATAL) << "Failed to create GL surface";
       if (surface->IsSurfaceless())
-        return base::WrapUnique(
-            new ui::SurfacelessGlRenderer(widget, surface, size));
+        return base::MakeUnique<ui::SurfacelessGlRenderer>(widget, surface,
+                                                           size);
       else
-        return base::WrapUnique(new ui::GlRenderer(widget, surface, size));
+        return base::MakeUnique<ui::GlRenderer>(widget, surface, size);
     }
     case SOFTWARE:
-      return base::WrapUnique(new ui::SoftwareRenderer(widget, size));
+      return base::MakeUnique<ui::SoftwareRenderer>(widget, size);
   }
 
   return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowManager implementation:
 
 WindowManager::WindowManager(const base::Closure& quit_closure)
     : delegate_(
@@ skipping 99 matching lines @@
       ->SetCurrentLayoutByName("us");
 
   base::RunLoop run_loop;
 
   WindowManager window_manager(run_loop.QuitClosure());
 
   run_loop.Run();
 
   return 0;
 }