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

ui/ozone/platform/x11/ozone_platform_x11.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/x11/ozone_platform_x11.h"
 
 #include <X11/Xlib.h>
 
 #include <memory>
 #include <utility>
@@ skipping 63 matching lines @@
     return gpu_platform_support_.get();
   }
 
   GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
     return gpu_platform_support_host_.get();
   }
 
   std::unique_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override {
-    std::unique_ptr<X11WindowOzone> window =
-        base::WrapUnique(new X11WindowOzone(event_source_.get(),
-                                            window_manager_.get(), delegate));
+    std::unique_ptr<X11WindowOzone> window = base::MakeUnique<X11WindowOzone>(
+        event_source_.get(), window_manager_.get(), delegate);
     window->SetBounds(bounds);
     window->Create();
     window->SetTitle(base::ASCIIToUTF16("Ozone X11"));
     return std::move(window);
   }
 
   std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
-    return base::WrapUnique(new NativeDisplayDelegateOzoneX11());
+    return base::MakeUnique<NativeDisplayDelegateOzoneX11>();
   }
 
   void InitializeUI() override {
     window_manager_.reset(new X11WindowManagerOzone);
     event_source_.reset(new X11EventSourceLibevent(gfx::GetXDisplay()));
     overlay_manager_.reset(new StubOverlayManager());
     input_controller_ = CreateStubInputController();
     cursor_factory_ozone_.reset(new X11CursorFactoryOzone());
     gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
   }
@@ skipping 19 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformX11);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformX11() {
   return new OzonePlatformX11;
 }
 
 }  // namespace ui