Replace scoped_ptr with std::unique_ptr in //ui

ui/ozone/platform/drm/gpu/hardware_display_controller.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/hardware_display_controller.h"
 
 #include <drm.h>
 #include <string.h>
 #include <xf86drm.h>
 #include <utility>
@@ skipping 12 matching lines @@
 
 namespace ui {
 
 namespace {
 
 void EmptyFlipCallback(gfx::SwapResult) {}
 
 }  // namespace
 
 HardwareDisplayController::HardwareDisplayController(
-    scoped_ptr<CrtcController> controller,
+    std::unique_ptr<CrtcController> controller,
     const gfx::Point& origin)
-    : origin_(origin),
-      is_disabled_(controller->is_disabled()) {
+    : origin_(origin), is_disabled_(controller->is_disabled()) {
   AddCrtc(std::move(controller));
 }
 
 HardwareDisplayController::~HardwareDisplayController() {
   // Reset the cursor.
   UnsetCursor();
 }
 
 bool HardwareDisplayController::Modeset(const OverlayPlane& primary,
                                         drmModeModeInfo mode) {
@@ skipping 122 matching lines @@
   if (is_disabled_)
     return true;
 
   bool status = true;
   for (const auto& controller : crtc_controllers_)
     status &= controller->MoveCursor(location);
 
   return status;
 }
 
-void HardwareDisplayController::AddCrtc(scoped_ptr<CrtcController> controller) {
+void HardwareDisplayController::AddCrtc(
+    std::unique_ptr<CrtcController> controller) {
   scoped_refptr<DrmDevice> drm = controller->drm();
-  owned_hardware_planes_.add(drm.get(), scoped_ptr<HardwareDisplayPlaneList>(
-                                            new HardwareDisplayPlaneList()));
+  owned_hardware_planes_.add(drm.get(),
+                             std::unique_ptr<HardwareDisplayPlaneList>(
+                                 new HardwareDisplayPlaneList()));
 
   // Check if this controller owns any planes and ensure we keep track of them.
-  const std::vector<scoped_ptr<HardwareDisplayPlane>>& all_planes =
+  const std::vector<std::unique_ptr<HardwareDisplayPlane>>& all_planes =
       drm->plane_manager()->planes();
   HardwareDisplayPlaneList* crtc_plane_list =
       owned_hardware_planes_.get(drm.get());
   uint32_t crtc = controller->crtc();
   for (const auto& plane : all_planes) {
     if (plane->in_use() && (plane->owning_crtc() == crtc))
       crtc_plane_list->old_plane_list.push_back(plane.get());
   }
 
   crtc_controllers_.push_back(std::move(controller));
 }
 
-scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
+std::unique_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
     const scoped_refptr<DrmDevice>& drm,
     uint32_t crtc) {
   for (auto it = crtc_controllers_.begin(); it != crtc_controllers_.end();
        ++it) {
     if ((*it)->drm() == drm && (*it)->crtc() == crtc) {
-      scoped_ptr<CrtcController> controller(std::move(*it));
+      std::unique_ptr<CrtcController> controller(std::move(*it));
       crtc_controllers_.erase(it);
 
       // Remove entry from |owned_hardware_planes_| iff no other crtcs share it.
       bool found = false;
       for (auto it = crtc_controllers_.begin(); it != crtc_controllers_.end();
            ++it) {
         if ((*it)->drm() == controller->drm()) {
           found = true;
           break;
         }
@@ skipping 54 matching lines @@
 
 scoped_refptr<DrmDevice> HardwareDisplayController::GetAllocationDrmDevice()
     const {
   DCHECK(!crtc_controllers_.empty());
   // TODO(dnicoara) When we support mirroring across DRM devices, figure out
   // which device should be used for allocations.
   return crtc_controllers_[0]->drm();
 }
 
 }  // namespace ui