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

ui/ozone/platform/drm/gpu/screen_manager.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/gpu/screen_manager.h"
 
 #include <xf86drmMode.h>
 
 #include <utility>
 
@@ skipping 84 matching lines @@
   HardwareDisplayControllers::iterator it = FindDisplayController(drm, crtc);
   // TODO(dnicoara): Turn this into a DCHECK when async display configuration is
   // properly supported. (When there can't be a race between forcing initial
   // display configuration in ScreenManager and NativeDisplayDelegate creating
   // the display controllers.)
   if (it != controllers_.end()) {
     LOG(WARNING) << "Display controller (crtc=" << crtc << ") already present.";
     return;
   }
 
-  controllers_.push_back(base::WrapUnique(new HardwareDisplayController(
+  controllers_.push_back(base::MakeUnique<HardwareDisplayController>(
       std::unique_ptr<CrtcController>(new CrtcController(drm, crtc, connector)),
-      gfx::Point())));
+      gfx::Point()));
 }
 
 void ScreenManager::RemoveDisplayController(const scoped_refptr<DrmDevice>& drm,
                                             uint32_t crtc) {
   HardwareDisplayControllers::iterator it = FindDisplayController(drm, crtc);
   if (it != controllers_.end()) {
     bool is_mirrored = (*it)->IsMirrored();
     (*it)->RemoveCrtc(drm, crtc);
     if (!is_mirrored) {
       controllers_.erase(it);
@@ skipping 45 matching lines @@
 
     // Just re-enable the controller to re-use the current state.
     return EnableController(controller);
   }
 
   // Either the mode or the location of the display changed, so exit mirror
   // mode and configure the display independently. If the caller still wants
   // mirror mode, subsequent calls configuring the other controllers will
   // restore mirror mode.
   if (controller->IsMirrored()) {
-    controllers_.push_back(base::WrapUnique(new HardwareDisplayController(
-        controller->RemoveCrtc(drm, crtc), controller->origin())));
+    controllers_.push_back(base::MakeUnique<HardwareDisplayController>(
+        controller->RemoveCrtc(drm, crtc), controller->origin()));
     it = controllers_.end() - 1;
     controller = it->get();
   }
 
   HardwareDisplayControllers::iterator mirror =
       FindActiveDisplayControllerByLocation(modeset_bounds);
   // Handle mirror mode.
   if (mirror != controllers_.end() && it != mirror)
     return HandleMirrorMode(it, mirror, drm, crtc, connector, mode);
 
   return ModesetController(controller, origin, mode);
 }
 
 bool ScreenManager::DisableDisplayController(
     const scoped_refptr<DrmDevice>& drm,
     uint32_t crtc) {
   HardwareDisplayControllers::iterator it = FindDisplayController(drm, crtc);
   if (it != controllers_.end()) {
     HardwareDisplayController* controller = it->get();
     if (controller->IsMirrored()) {
-      controllers_.push_back(base::WrapUnique(new HardwareDisplayController(
-          controller->RemoveCrtc(drm, crtc), controller->origin())));
+      controllers_.push_back(base::MakeUnique<HardwareDisplayController>(
+          controller->RemoveCrtc(drm, crtc), controller->origin()));
       controller = controllers_.back().get();
     }
 
     controller->Disable();
     UpdateControllerToWindowMapping();
     return true;
   }
 
   LOG(ERROR) << "Failed to find display controller crtc=" << crtc;
   return false;
@@ skipping 180 matching lines @@
 DrmWindow* ScreenManager::FindWindowAt(const gfx::Rect& bounds) const {
   for (auto pair : window_map_) {
     if (pair.second->bounds() == bounds)
       return pair.second;
   }
 
   return nullptr;
 }
 
 }  // namespace ui