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

ash/display/display_manager.cc

Index: ash/display/display_manager.cc
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 05c0f137716a6da27e6eccfef307deb038fca8e9..447c78f8d695c811d50c212e692559c65f4e5672 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -1057,12 +1057,12 @@ void DisplayManager::CreateMirrorWindowAsyncIfAny() {
 std::unique_ptr<MouseWarpController> DisplayManager::CreateMouseWarpController(
     aura::Window* drag_source) const {
   if (IsInUnifiedMode() && num_connected_displays() >= 2)
-    return base::WrapUnique(new UnifiedMouseWarpController());
+    return base::MakeUnique<UnifiedMouseWarpController>();
   // Extra check for |num_connected_displays()| is for SystemDisplayApiTest
   // that injects MockScreen.
   if (GetNumDisplays() < 2 || num_connected_displays() < 2)
-    return base::WrapUnique(new NullMouseWarpController());
-  return base::WrapUnique(new ExtendedMouseWarpController(drag_source));
+    return base::MakeUnique<NullMouseWarpController>();
+  return base::MakeUnique<ExtendedMouseWarpController>(drag_source);
 }
 
 void DisplayManager::CreateScreenForShutdown() const {