Convert //ash from scoped_ptr to std::unique_ptr

ash/display/extended_mouse_warp_controller.cc

 // 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.
 
 #include "ash/display/extended_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/shared_display_edge_indicator.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
+#include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 80 matching lines @@
                                        : gfx::Display::kInvalidDisplayID;
   display::DisplayList display_list = display_manager->active_display_list();
   // Try to create a Warp region for all possible two displays combination.
   // The following code does it by poping the last element in the list
   // and then pairing with remaining displays in the list, until the list
   // becomes single element.
   while (display_list.size() > 1) {
     gfx::Display display = display_list.back();
     display_list.pop_back();
     for (const gfx::Display& peer : display_list) {
-      scoped_ptr<WarpRegion> region =
+      std::unique_ptr<WarpRegion> region =
           CreateWarpRegion(display, peer, drag_source_id);
       if (region)
         AddWarpRegion(std::move(region), drag_source != nullptr);
     }
   }
 }
 
 ExtendedMouseWarpController::~ExtendedMouseWarpController() {
 }
 
@@ skipping 31 matching lines @@
 #endif
 
   return WarpMouseCursorInNativeCoords(point_in_native, point_in_screen, false);
 }
 
 void ExtendedMouseWarpController::SetEnabled(bool enabled) {
   enabled_ = enabled;
 }
 
 void ExtendedMouseWarpController::AddWarpRegion(
-    scoped_ptr<WarpRegion> warp_region,
+    std::unique_ptr<WarpRegion> warp_region,
     bool has_drag_source) {
   if (has_drag_source) {
     warp_region->shared_display_edge_indicator_.reset(
         new SharedDisplayEdgeIndicator);
     warp_region->shared_display_edge_indicator_->Show(
         warp_region->a_indicator_bounds_, warp_region->b_indicator_bounds_);
   }
 
   warp_regions_.emplace_back(std::move(warp_region));
 }
 
 bool ExtendedMouseWarpController::WarpMouseCursorInNativeCoords(
     const gfx::Point& point_in_native,
     const gfx::Point& point_in_screen,
     bool update_mouse_location_now) {
-  for (const scoped_ptr<WarpRegion>& warp : warp_regions_) {
+  for (const std::unique_ptr<WarpRegion>& warp : warp_regions_) {
     bool in_a_edge = warp->a_edge_bounds_in_native_.Contains(point_in_native);
     bool in_b_edge = warp->b_edge_bounds_in_native_.Contains(point_in_native);
     if (!in_a_edge && !in_b_edge)
       continue;
 
     // The mouse must move.
     aura::Window* dst_window = GetRootWindowForDisplayId(
         in_a_edge ? warp->b_display_id_ : warp->a_display_id_);
     AshWindowTreeHost* target_ash_host =
         GetRootWindowController(dst_window)->ash_host();
 
     MoveCursorTo(target_ash_host, point_in_screen, update_mouse_location_now);
     return true;
   }
 
   return false;
 }
 
-scoped_ptr<ExtendedMouseWarpController::WarpRegion>
+std::unique_ptr<ExtendedMouseWarpController::WarpRegion>
 ExtendedMouseWarpController::CreateWarpRegion(const gfx::Display& a,
                                               const gfx::Display& b,
                                               int64_t drag_source_id) {
   gfx::Rect a_edge;
   gfx::Rect b_edge;
   int snap_barrier = drag_source_id == gfx::Display::kInvalidDisplayID
                          ? 0
                          : kMaximumSnapHeight;
 
   if (!ComputeBoundary(a, b, &a_edge, &b_edge))
     return nullptr;
 
   // Creates the snap window barrirer only when horizontally connected.
   if (a_edge.height() > a_edge.width()) {
     if (drag_source_id == a.id())
       AdjustSourceEdgeBounds(a.bounds(), snap_barrier, &a_edge);
     else if (drag_source_id == b.id())
       AdjustSourceEdgeBounds(b.bounds(), snap_barrier, &b_edge);
   }
 
-  return make_scoped_ptr(new WarpRegion(a.id(), b.id(), a_edge, b_edge));
+  return base::WrapUnique(new WarpRegion(a.id(), b.id(), a_edge, b_edge));
 }
 
 }  // namespace ash