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

ui/ozone/platform/drm/ozone_platform_gbm.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/drm/ozone_platform_gbm.h"
 
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <gbm.h>
 #include <stdlib.h>
@@ skipping 117 matching lines @@
     }
 
     std::unique_ptr<DrmWindowHost> platform_window(new DrmWindowHost(
         delegate, bounds, adapter, event_factory_ozone_.get(), cursor_.get(),
         window_manager_.get(), display_manager_.get(), overlay_manager_.get()));
     platform_window->Initialize();
     return std::move(platform_window);
   }
   std::unique_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       override {
-    return base::WrapUnique(
-        new DrmNativeDisplayDelegate(display_manager_.get()));
+    return base::MakeUnique<DrmNativeDisplayDelegate>(display_manager_.get());
   }
   void InitializeUI() override {
     InitParams default_params;
     InitializeUI(default_params);
   }
   void InitializeUI(const InitParams& args) override {
     // Ozone drm can operate in three modes configured at runtime:
     //   1. legacy mode where browser and gpu components communicate
     //      via param traits IPC.
     //   2. single-process mode where browser and gpu components
     //      communicate via PostTask.
     //   3. mojo mode where browser and gpu components communicate
     //      via mojo IPC.
     // Currently, mojo mode uses mojo in a single process but this is
     // an interim implementation detail that will be eliminated in a
     // future CL.
     single_process_ = args.single_process;
     using_mojo_ = args.connector != nullptr;
     DCHECK(!(using_mojo_ && single_process_));
 
     device_manager_ = CreateDeviceManager();
     window_manager_.reset(new DrmWindowHostManager());
     cursor_.reset(new DrmCursor(window_manager_.get()));
 #if defined(USE_XKBCOMMON)
-    KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(base::WrapUnique(
-        new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
+    KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
+        base::MakeUnique<XkbKeyboardLayoutEngine>(xkb_evdev_code_converter_));
 #else
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
-        base::WrapUnique(new StubKeyboardLayoutEngine()));
+        base::MakeUnique<StubKeyboardLayoutEngine>());
 #endif
 
     event_factory_ozone_.reset(new EventFactoryEvdev(
         cursor_.get(), device_manager_.get(),
         KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
 
     GpuThreadAdapter* adapter;
 
     // TODO(rjkroege): Once mus is split, only do this for single_process.
     if (single_process_ || using_mojo_)
@@ skipping 91 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformGbm() {
   return new OzonePlatformGbm;
 }
 
 }  // namespace ui