| Index: ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| index e32d151171bfe07abbbafbe1bb92fabfa39946cf..403f5552f5686b053067cddce9854cf860ae3ef6 100644
|
| --- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| +++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| @@ -135,8 +135,7 @@ class OzonePlatformGbm
|
| }
|
| 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;
|
| @@ -161,11 +160,11 @@ class OzonePlatformGbm
|
| 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(
|
|
|