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

ui/ozone/platform/caca/ozone_platform_caca.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 "ui/ozone/platform/caca/ozone_platform_caca.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h"
@@ skipping 44 matching lines @@
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override {
     std::unique_ptr<CacaWindow> caca_window(new CacaWindow(
         delegate, window_manager_.get(), event_source_.get(), bounds));
     if (!caca_window->Initialize())
       return nullptr;
     return std::move(caca_window);
   }
   std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
-    return base::WrapUnique(new NativeDisplayDelegateOzone());
+    return base::MakeUnique<NativeDisplayDelegateOzone>();
   }
 
   void InitializeUI() override {
     window_manager_.reset(new CacaWindowManager);
     overlay_manager_.reset(new StubOverlayManager());
     event_source_.reset(new CacaEventSource());
     cursor_factory_ozone_.reset(new CursorFactoryOzone());
     gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
     input_controller_ = CreateStubInputController();
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
-        base::WrapUnique(new NoKeyboardLayoutEngine()));
+        base::MakeUnique<NoKeyboardLayoutEngine>());
   }
 
   void InitializeGPU() override {
     gpu_platform_support_.reset(CreateStubGpuPlatformSupport());
   }
 
  private:
   std::unique_ptr<CacaWindowManager> window_manager_;
   std::unique_ptr<CacaEventSource> event_source_;
   std::unique_ptr<CursorFactoryOzone> cursor_factory_ozone_;
   std::unique_ptr<GpuPlatformSupport> gpu_platform_support_;
   std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
   std::unique_ptr<InputController> input_controller_;
   std::unique_ptr<OverlayManagerOzone> overlay_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformCaca() {
   return new OzonePlatformCaca;
 }
 
 }  // namespace ui