Replace scoped_ptr with std::unique_ptr in //ui

ui/events/ozone/evdev/event_factory_evdev.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/event_factory_evdev.h"
 
 #include <utility>
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/ozone/device/device_event.h"
 #include "ui/events/ozone/device/device_manager.h"
@@ skipping 122 matching lines @@
 }
 
 void EventFactoryEvdev::Init() {
   DCHECK(!initialized_);
 
   StartThread();
 
   initialized_ = true;
 }
 
-scoped_ptr<SystemInputInjector> EventFactoryEvdev::CreateSystemInputInjector() {
+std::unique_ptr<SystemInputInjector>
+EventFactoryEvdev::CreateSystemInputInjector() {
   // Use forwarding dispatcher for the injector rather than dispatching
   // directly. We cannot assume it is safe to (re-)enter ui::Event dispatch
   // synchronously from the injection point.
-  scoped_ptr<DeviceEventDispatcherEvdev> proxy_dispatcher(
+  std::unique_ptr<DeviceEventDispatcherEvdev> proxy_dispatcher(
       new ProxyDeviceEventDispatcher(base::ThreadTaskRunnerHandle::Get(),
                                      weak_ptr_factory_.GetWeakPtr()));
-  return make_scoped_ptr(
+  return base::WrapUnique(
       new InputInjectorEvdev(std::move(proxy_dispatcher), cursor_));
 }
 
 void EventFactoryEvdev::DispatchKeyEvent(const KeyEventParams& params) {
   TRACE_EVENT1("evdev", "EventFactoryEvdev::DispatchKeyEvent", "device",
                params.device_id);
   keyboard_.OnKeyChange(params.code, params.down, params.suppress_auto_repeat,
                         params.timestamp, params.device_id);
 }
 
@@ skipping 227 matching lines @@
                      PointerDetails(EventPointerType::POINTER_TYPE_MOUSE),
                      EventTimeForNow())));
 }
 
 int EventFactoryEvdev::NextDeviceId() {
   return ++last_device_id_;
 }
 
 void EventFactoryEvdev::StartThread() {
   // Set up device factory.
-  scoped_ptr<DeviceEventDispatcherEvdev> proxy_dispatcher(
+  std::unique_ptr<DeviceEventDispatcherEvdev> proxy_dispatcher(
       new ProxyDeviceEventDispatcher(base::ThreadTaskRunnerHandle::Get(),
                                      weak_ptr_factory_.GetWeakPtr()));
   thread_.Start(std::move(proxy_dispatcher), cursor_,
                 base::Bind(&EventFactoryEvdev::OnThreadStarted,
                            weak_ptr_factory_.GetWeakPtr()));
 }
 
 void EventFactoryEvdev::OnThreadStarted(
-    scoped_ptr<InputDeviceFactoryEvdevProxy> input_device_factory) {
+    std::unique_ptr<InputDeviceFactoryEvdevProxy> input_device_factory) {
   TRACE_EVENT0("evdev", "EventFactoryEvdev::OnThreadStarted");
   input_device_factory_proxy_ = std::move(input_device_factory);
 
   // Hook up device configuration.
   input_controller_.SetInputDeviceFactory(input_device_factory_proxy_.get());
 
   // Scan & monitor devices.
   device_manager_->AddObserver(this);
   device_manager_->ScanDevices(this);
 
   // Notify device thread that initial scan is done.
   input_device_factory_proxy_->OnStartupScanComplete();
 }
 
 }  // namespace ui