Replace scoped_ptr with std::unique_ptr in //ui

ui/events/ozone/evdev/tablet_event_converter_evdev_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/events/ozone/evdev/tablet_event_converter_evdev.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <unistd.h>
+
+#include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_converter_test_util.h"
 #include "ui/events/ozone/evdev/event_device_test_util.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
@@ skipping 62 matching lines @@
   // Actually dispatch the event reader code.
   void ReadNow() {
     OnFileCanReadWithoutBlocking(read_pipe_);
     base::RunLoop().RunUntilIdle();
   }
 
  private:
   int read_pipe_;
   int write_pipe_;
 
-  std::vector<scoped_ptr<Event>> dispatched_events_;
+  std::vector<std::unique_ptr<Event>> dispatched_events_;
 
   DISALLOW_COPY_AND_ASSIGN(MockTabletEventConverterEvdev);
 };
 
 class MockTabletCursorEvdev : public CursorDelegateEvdev {
  public:
   MockTabletCursorEvdev() { cursor_confined_bounds_ = gfx::Rect(1024, 768); }
   ~MockTabletCursorEvdev() override {}
 
   // CursorDelegateEvdev:
@@ skipping 95 matching lines @@
 
   unsigned size() { return dispatched_events_.size(); }
   ui::MouseEvent* dispatched_event(unsigned index) {
     DCHECK_GT(dispatched_events_.size(), index);
     ui::Event* ev = dispatched_events_[index].get();
     DCHECK(ev->IsMouseEvent());
     return ev->AsMouseEvent();
   }
 
   void DispatchEventForTest(ui::Event* event) {
-    scoped_ptr<ui::Event> cloned_event = ui::Event::Clone(*event);
+    std::unique_ptr<ui::Event> cloned_event = ui::Event::Clone(*event);
     dispatched_events_.push_back(std::move(cloned_event));
   }
 
  private:
-  scoped_ptr<ui::MockTabletCursorEvdev> cursor_;
-  scoped_ptr<ui::DeviceManager> device_manager_;
-  scoped_ptr<ui::EventFactoryEvdev> event_factory_;
-  scoped_ptr<ui::DeviceEventDispatcherEvdev> dispatcher_;
+  std::unique_ptr<ui::MockTabletCursorEvdev> cursor_;
+  std::unique_ptr<ui::DeviceManager> device_manager_;
+  std::unique_ptr<ui::EventFactoryEvdev> event_factory_;
+  std::unique_ptr<ui::DeviceEventDispatcherEvdev> dispatcher_;
 
-  std::vector<scoped_ptr<ui::Event>> dispatched_events_;
+  std::vector<std::unique_ptr<ui::Event>> dispatched_events_;
 
   int events_out_;
   int events_in_;
 
   DISALLOW_COPY_AND_ASSIGN(TabletEventConverterEvdevTest);
 };
 
 #define EPSILON 20
 
 // Uses real data captured from Wacom Intuos 5 Pen
 TEST_F(TabletEventConverterEvdevTest, MoveTopLeft) {
-  scoped_ptr<ui::MockTabletEventConverterEvdev> dev =
-      make_scoped_ptr(CreateDevice(kWacomIntuos5SPen));
+  std::unique_ptr<ui::MockTabletEventConverterEvdev> dev =
+      base::WrapUnique(CreateDevice(kWacomIntuos5SPen));
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_DISTANCE, 63},
       {{0, 0}, EV_ABS, ABS_X, 477},
       {{0, 0}, EV_ABS, ABS_TILT_X, 66},
       {{0, 0}, EV_ABS, ABS_TILT_Y, 62},
       {{0, 0}, EV_ABS, ABS_MISC, 1050626},
       {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
       {{0, 0}, EV_MSC, MSC_SERIAL, 897618290},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
@@ skipping 10 matching lines @@
   EXPECT_EQ(1u, size());
 
   ui::MouseEvent* event = dispatched_event(0);
   EXPECT_EQ(ui::ET_MOUSE_MOVED, event->type());
 
   EXPECT_LT(cursor()->GetLocation().x(), EPSILON);
   EXPECT_LT(cursor()->GetLocation().y(), EPSILON);
 }
 
 TEST_F(TabletEventConverterEvdevTest, MoveTopRight) {
-  scoped_ptr<ui::MockTabletEventConverterEvdev> dev =
-      make_scoped_ptr(CreateDevice(kWacomIntuos5SPen));
+  std::unique_ptr<ui::MockTabletEventConverterEvdev> dev =
+      base::WrapUnique(CreateDevice(kWacomIntuos5SPen));
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_DISTANCE, 63},
       {{0, 0}, EV_ABS, ABS_X, 31496},
       {{0, 0}, EV_ABS, ABS_Y, 109},
       {{0, 0}, EV_ABS, ABS_TILT_X, 66},
       {{0, 0}, EV_ABS, ABS_TILT_Y, 61},
       {{0, 0}, EV_ABS, ABS_MISC, 1050626},
       {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
       {{0, 0}, EV_MSC, MSC_SERIAL, 897618290},
@@ skipping 13 matching lines @@
 
   ui::MouseEvent* event = dispatched_event(0);
   EXPECT_EQ(ui::ET_MOUSE_MOVED, event->type());
 
   EXPECT_GT(cursor()->GetLocation().x(),
             cursor()->GetCursorConfinedBounds().width() - EPSILON);
   EXPECT_LT(cursor()->GetLocation().y(), EPSILON);
 }
 
 TEST_F(TabletEventConverterEvdevTest, MoveBottomLeft) {
-  scoped_ptr<ui::MockTabletEventConverterEvdev> dev =
-      make_scoped_ptr(CreateDevice(kWacomIntuos5SPen));
+  std::unique_ptr<ui::MockTabletEventConverterEvdev> dev =
+      base::WrapUnique(CreateDevice(kWacomIntuos5SPen));
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_DISTANCE, 63},
       {{0, 0}, EV_ABS, ABS_Y, 19685},
       {{0, 0}, EV_ABS, ABS_TILT_X, 64},
       {{0, 0}, EV_ABS, ABS_TILT_Y, 61},
       {{0, 0}, EV_ABS, ABS_MISC, 1050626},
       {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
       {{0, 0}, EV_MSC, MSC_SERIAL, 897618290},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
@@ skipping 13 matching lines @@
 
   ui::MouseEvent* event = dispatched_event(0);
   EXPECT_EQ(ui::ET_MOUSE_MOVED, event->type());
 
   EXPECT_LT(cursor()->GetLocation().x(), EPSILON);
   EXPECT_GT(cursor()->GetLocation().y(),
             cursor()->GetCursorConfinedBounds().height() - EPSILON);
 }
 
 TEST_F(TabletEventConverterEvdevTest, MoveBottomRight) {
-  scoped_ptr<ui::MockTabletEventConverterEvdev> dev =
-      make_scoped_ptr(CreateDevice(kWacomIntuos5SPen));
+  std::unique_ptr<ui::MockTabletEventConverterEvdev> dev =
+      base::WrapUnique(CreateDevice(kWacomIntuos5SPen));
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_DISTANCE, 63},
       {{0, 0}, EV_ABS, ABS_X, 31496},
       {{0, 0}, EV_ABS, ABS_Y, 19685},
       {{0, 0}, EV_ABS, ABS_TILT_X, 67},
       {{0, 0}, EV_ABS, ABS_TILT_Y, 63},
       {{0, 0}, EV_ABS, ABS_MISC, 1050626},
       {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
       {{0, 0}, EV_MSC, MSC_SERIAL, 897618290},
@@ skipping 15 matching lines @@
   ui::MouseEvent* event = dispatched_event(0);
   EXPECT_EQ(ui::ET_MOUSE_MOVED, event->type());
 
   EXPECT_GT(cursor()->GetLocation().x(),
             cursor()->GetCursorConfinedBounds().height() - EPSILON);
   EXPECT_GT(cursor()->GetLocation().y(),
             cursor()->GetCursorConfinedBounds().height() - EPSILON);
 }
 
 TEST_F(TabletEventConverterEvdevTest, Tap) {
-  scoped_ptr<ui::MockTabletEventConverterEvdev> dev =
-      make_scoped_ptr(CreateDevice(kWacomIntuos5SPen));
+  std::unique_ptr<ui::MockTabletEventConverterEvdev> dev =
+      base::WrapUnique(CreateDevice(kWacomIntuos5SPen));
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_X, 15456},
       {{0, 0}, EV_ABS, ABS_Y, 8605},
       {{0, 0}, EV_ABS, ABS_DISTANCE, 49},
       {{0, 0}, EV_ABS, ABS_TILT_X, 68},
       {{0, 0}, EV_ABS, ABS_TILT_Y, 64},
       {{0, 0}, EV_ABS, ABS_MISC, 1050626},
       {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
       {{0, 0}, EV_MSC, MSC_SERIAL, 897618290},
@@ skipping 40 matching lines @@
   EXPECT_EQ(true, event->IsLeftMouseButton());
   event = dispatched_event(2);
   EXPECT_EQ(ui::EventPointerType::POINTER_TYPE_PEN,
             event->pointer_details().pointer_type);
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, event->type());
   EXPECT_FLOAT_EQ(0.0f, event->pointer_details().force);
   EXPECT_EQ(true, event->IsLeftMouseButton());
 }
 
 TEST_F(TabletEventConverterEvdevTest, StylusButtonPress) {
-  scoped_ptr<ui::MockTabletEventConverterEvdev> dev =
-      make_scoped_ptr(CreateDevice(kWacomIntuos5SPen));
+  std::unique_ptr<ui::MockTabletEventConverterEvdev> dev =
+      base::WrapUnique(CreateDevice(kWacomIntuos5SPen));
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_DISTANCE, 63},
       {{0, 0}, EV_ABS, ABS_X, 18372},
       {{0, 0}, EV_ABS, ABS_Y, 9880},
       {{0, 0}, EV_ABS, ABS_DISTANCE, 61},
       {{0, 0}, EV_ABS, ABS_TILT_X, 60},
       {{0, 0}, EV_ABS, ABS_TILT_Y, 63},
       {{0, 0}, EV_ABS, ABS_MISC, 1050626},
       {{0, 0}, EV_KEY, BTN_TOOL_PEN, 1},
@@ skipping 31 matching lines @@
   event = dispatched_event(1);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, event->type());
   EXPECT_EQ(true, event->IsRightMouseButton());
   event = dispatched_event(2);
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, event->type());
   EXPECT_EQ(true, event->IsRightMouseButton());
 }
 
 // Should only get an event if BTN_TOOL received
 TEST_F(TabletEventConverterEvdevTest, CheckStylusFiltering) {
-  scoped_ptr<ui::MockTabletEventConverterEvdev> dev =
-      make_scoped_ptr(CreateDevice(kWacomIntuos5SPen));
+  std::unique_ptr<ui::MockTabletEventConverterEvdev> dev =
+      base::WrapUnique(CreateDevice(kWacomIntuos5SPen));
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_X, 0},
       {{0, 0}, EV_ABS, ABS_Y, 0},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
   };
 
   dev->ProcessEvents(mock_kernel_queue, arraysize(mock_kernel_queue));
   EXPECT_EQ(0u, size());
 }