Replace scoped_ptr with std::unique_ptr in //ui

ui/ozone/platform/drm/gpu/screen_manager.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_SCREEN_MANAGER_H_
 #define UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_
 
 #include <stdint.h>
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 47 matching lines @@
   bool DisableDisplayController(const scoped_refptr<DrmDevice>& drm,
                                 uint32_t crtc);
 
   // Returns a reference to the display controller configured to display within
   // |bounds|. If the caller caches the controller it must also register as an
   // observer to be notified when the controller goes out of scope.
   HardwareDisplayController* GetDisplayController(const gfx::Rect& bounds);
 
   // Adds a window for |widget|. Note: |widget| should not be associated with a
   // window when calling this function.
-  void AddWindow(gfx::AcceleratedWidget widget, scoped_ptr<DrmWindow> window);
+  void AddWindow(gfx::AcceleratedWidget widget,
+                 std::unique_ptr<DrmWindow> window);
 
   // Removes the window for |widget|. Note: |widget| must have a window
   // associated with it when calling this function.
-  scoped_ptr<DrmWindow> RemoveWindow(gfx::AcceleratedWidget widget);
+  std::unique_ptr<DrmWindow> RemoveWindow(gfx::AcceleratedWidget widget);
 
   // Returns the window associated with |widget|. Note: This function should be
   // called only if a valid window has been associated with |widget|.
   DrmWindow* GetWindow(gfx::AcceleratedWidget widget);
 
   // Updates the mapping between display controllers and windows such that a
   // controller will be associated with at most one window.
   void UpdateControllerToWindowMapping();
 
  private:
-  typedef std::vector<scoped_ptr<HardwareDisplayController>>
+  typedef std::vector<std::unique_ptr<HardwareDisplayController>>
       HardwareDisplayControllers;
-  typedef base::ScopedPtrHashMap<gfx::AcceleratedWidget, scoped_ptr<DrmWindow>>
+  typedef base::ScopedPtrHashMap<gfx::AcceleratedWidget,
+                                 std::unique_ptr<DrmWindow>>
       WidgetToWindowMap;
 
   // Returns an iterator into |controllers_| for the controller identified by
   // (|crtc|, |connector|).
   HardwareDisplayControllers::iterator FindDisplayController(
       const scoped_refptr<DrmDevice>& drm,
       uint32_t crtc);
 
   bool ActualConfigureDisplayController(const scoped_refptr<DrmDevice>& drm,
                                         uint32_t crtc,
@@ skipping 34 matching lines @@
   HardwareDisplayControllers controllers_;
 
   WidgetToWindowMap window_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_SCREEN_MANAGER_H_