Convert //ash from scoped_ptr to std::unique_ptr

ash/display/extended_mouse_warp_controller.h

 // Copyright 2015 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 ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 #define ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 
 #include "ash/display/mouse_warp_controller.h"
 
+#include <memory>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Point;
 class Display;
 }
@@ skipping 52 matching lines @@
     gfx::Rect a_edge_bounds_in_native_;
     gfx::Rect b_edge_bounds_in_native_;
 
     // The bounds for warp hole windows. These are kept in the instance for
     // testing.
     gfx::Rect a_indicator_bounds_;
     gfx::Rect b_indicator_bounds_;
 
     // Shows the area where a window can be dragged in to/out from another
     // display.
-    scoped_ptr<SharedDisplayEdgeIndicator> shared_display_edge_indicator_;
+    std::unique_ptr<SharedDisplayEdgeIndicator> shared_display_edge_indicator_;
 
     DISALLOW_COPY_AND_ASSIGN(WarpRegion);
   };
 
-  std::vector<scoped_ptr<WarpRegion>> warp_regions_;
+  std::vector<std::unique_ptr<WarpRegion>> warp_regions_;
 
   // Registers the WarpRegion; also displays a drag indicator on the screen if
   // |has_drag_source| is true.
-  void AddWarpRegion(scoped_ptr<WarpRegion> region, bool has_drag_source);
+  void AddWarpRegion(std::unique_ptr<WarpRegion> region, bool has_drag_source);
 
   // Warps the mouse cursor to an alternate root window when the
   // mouse location in |event|, hits the edge of the event target's root and
   // the mouse cursor is considered to be in an alternate display.
   // If |update_mouse_location_now| is true,
   // Returns true if/ the cursor was moved.
   bool WarpMouseCursorInNativeCoords(const gfx::Point& point_in_native,
                                      const gfx::Point& point_in_screen,
                                      bool update_mouse_location_now);
 
   // Creates WarpRegion between display |a| and |b|.
   // |drag_source_dispaly_id| is used to indicate in which display a
   // drag is started, or invalid id passed if this is not for
   // dragging. Returns null scoped_ptr if two displays do not share
   // the edge.
-  scoped_ptr<WarpRegion> CreateWarpRegion(const gfx::Display& a,
-                                          const gfx::Display& b,
-                                          int64_t drag_source_dispay_id);
+  std::unique_ptr<WarpRegion> CreateWarpRegion(const gfx::Display& a,
+                                               const gfx::Display& b,
+                                               int64_t drag_source_dispay_id);
 
   void allow_non_native_event_for_test() { allow_non_native_event_ = true; }
 
   // The root window in which the dragging started.
   aura::Window* drag_source_root_;
 
   bool enabled_;
 
   bool allow_non_native_event_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H