Replace scoped_ptr with std::unique_ptr in //ui

ui/ozone/platform/drm/gpu/hardware_display_controller.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
 #define UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <xf86drmMode.h>
+
 #include <deque>
 #include <map>
+#include <memory>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/gfx/swap_result.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h"
 #include "ui/ozone/platform/drm/gpu/overlay_plane.h"
 
 namespace gfx {
 class Point;
 }
 
 namespace ui {
@@ skipping 53 matching lines @@
 //      ----------------------
 //
 // Note that it is possible to have more connectors than CRTCs which means that
 // only a subset of connectors can be active independently, showing different
 // framebuffers. Though, in this case, it would be possible to have all
 // connectors active if some use the same CRTC to mirror the display.
 class HardwareDisplayController {
   typedef base::Callback<void(gfx::SwapResult)> PageFlipCallback;
 
  public:
-  HardwareDisplayController(scoped_ptr<CrtcController> controller,
+  HardwareDisplayController(std::unique_ptr<CrtcController> controller,
                             const gfx::Point& origin);
   ~HardwareDisplayController();
 
   // Performs the initial CRTC configuration. If successful, it will display the
   // framebuffer for |primary| with |mode|.
   bool Modeset(const OverlayPlane& primary, drmModeModeInfo mode);
 
   // Performs a CRTC configuration re-using the modes from the CRTCs.
   bool Enable(const OverlayPlane& primary);
 
@@ skipping 24 matching lines @@
   bool IsFormatSupported(uint32_t fourcc_format, uint32_t z_order) const;
 
   // Set the hardware cursor to show the contents of |surface|.
   bool SetCursor(const scoped_refptr<ScanoutBuffer>& buffer);
 
   bool UnsetCursor();
 
   // Moves the hardware cursor to |location|.
   bool MoveCursor(const gfx::Point& location);
 
-  void AddCrtc(scoped_ptr<CrtcController> controller);
-  scoped_ptr<CrtcController> RemoveCrtc(const scoped_refptr<DrmDevice>& drm,
-                                        uint32_t crtc);
+  void AddCrtc(std::unique_ptr<CrtcController> controller);
+  std::unique_ptr<CrtcController> RemoveCrtc(
+      const scoped_refptr<DrmDevice>& drm,
+      uint32_t crtc);
   bool HasCrtc(const scoped_refptr<DrmDevice>& drm, uint32_t crtc) const;
   bool IsMirrored() const;
   bool IsDisabled() const;
   gfx::Size GetModeSize() const;
 
   gfx::Point origin() const { return origin_; }
   void set_origin(const gfx::Point& origin) { origin_ = origin; }
 
   uint64_t GetTimeOfLastFlip() const;
 
-  const std::vector<scoped_ptr<CrtcController>>& crtc_controllers() const {
+  const std::vector<std::unique_ptr<CrtcController>>& crtc_controllers() const {
     return crtc_controllers_;
   }
 
   scoped_refptr<DrmDevice> GetAllocationDrmDevice() const;
 
  private:
   bool ActualSchedulePageFlip(const OverlayPlaneList& plane_list,
                               bool test_only,
                               const PageFlipCallback& callback);
 
-  base::ScopedPtrHashMap<DrmDevice*, scoped_ptr<HardwareDisplayPlaneList>>
+  base::ScopedPtrHashMap<DrmDevice*, std::unique_ptr<HardwareDisplayPlaneList>>
       owned_hardware_planes_;
 
   // Stores the CRTC configuration. This is used to identify monitors and
   // configure them.
-  std::vector<scoped_ptr<CrtcController>> crtc_controllers_;
+  std::vector<std::unique_ptr<CrtcController>> crtc_controllers_;
 
   // Location of the controller on the screen.
   gfx::Point origin_;
 
   bool is_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_HARDWARE_DISPLAY_CONTROLLER_H_