Replace scoped_ptr with std::unique_ptr in //ui

ui/touch_selection/touch_selection_controller_unittest.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/touch_selection/touch_selection_controller.h"
 
 #include <vector>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/motion_event_test_utils.h"
 #include "ui/touch_selection/touch_selection_controller_test_api.h"
 
 using testing::ElementsAre;
 using testing::IsEmpty;
 using ui::test::MockMotionEvent;
 
 namespace ui {
@@ skipping 74 matching lines @@
     selection_end_ = extent;
   }
 
   void OnSelectionEvent(SelectionEventType event) override {
     events_.push_back(event);
     last_event_start_ = controller_->GetStartPosition();
     last_event_end_ = controller_->GetEndPosition();
     last_event_bounds_rect_ = controller_->GetRectBetweenBounds();
   }
 
-  scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
-    return make_scoped_ptr(new MockTouchHandleDrawable(&dragging_enabled_));
+  std::unique_ptr<TouchHandleDrawable> CreateDrawable() override {
+    return base::WrapUnique(new MockTouchHandleDrawable(&dragging_enabled_));
   }
 
   void AllowShowingOnTapForEmptyEditable() {
     TouchSelectionController::Config config = DefaultConfig();
     config.show_on_tap_for_empty_editable = true;
     controller_.reset(new TouchSelectionController(this, config));
   }
 
   void EnableLongPressDragSelection() {
     TouchSelectionController::Config config = DefaultConfig();
@@ skipping 115 matching lines @@
   gfx::PointF selection_start_;
   gfx::PointF selection_end_;
   gfx::RectF last_event_bounds_rect_;
   std::vector<SelectionEventType> events_;
   bool caret_moved_;
   bool selection_moved_;
   bool selection_points_swapped_;
   bool needs_animate_;
   bool animation_enabled_;
   bool dragging_enabled_;
-  scoped_ptr<TouchSelectionController> controller_;
+  std::unique_ptr<TouchSelectionController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerTest);
 };
 
 TEST_F(TouchSelectionControllerTest, InsertionBasic) {
   gfx::RectF insertion_rect(5, 5, 0, 10);
   bool visible = true;
 
   // Insertion handles are not shown until automatic showing is enabled.
   ChangeInsertion(insertion_rect, visible);
@@ skipping 1222 matching lines @@
                           offset_rect.x(), offset_rect.bottom());
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_HANDLE_DRAG_STOPPED));
   EXPECT_EQ(test_controller.GetStartHandleOrientation(),
             TouchHandleOrientation::LEFT);
   EXPECT_EQ(test_controller.GetEndHandleOrientation(),
             TouchHandleOrientation::RIGHT);
 }
 
 }  // namespace ui