Replace scoped_ptr with std::unique_ptr in //ui

ui/events/test/test_event_target.cc

Index: ui/events/test/test_event_target.cc
diff --git a/ui/events/test/test_event_target.cc b/ui/events/test/test_event_target.cc
index 36bbe20499067224e1da022716f5a1eea432edce..2f0f98e3e89ac250335a77cab4c77dd8ac21c6a8 100644
--- a/ui/events/test/test_event_target.cc
+++ b/ui/events/test/test_event_target.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/memory/ptr_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/events/event_targeter.h"
@@ -22,7 +23,7 @@ TestEventTarget::TestEventTarget()
 }
 TestEventTarget::~TestEventTarget() {}
 
-void TestEventTarget::AddChild(scoped_ptr<TestEventTarget> child) {
+void TestEventTarget::AddChild(std::unique_ptr<TestEventTarget> child) {
   TestEventTarget* child_r = child.get();
   if (child->parent()) {
     AddChild(child->parent()->RemoveChild(child.release()));
@@ -32,19 +33,21 @@ void TestEventTarget::AddChild(scoped_ptr<TestEventTarget> child) {
   child_r->set_parent(this);
 }
 
-scoped_ptr<TestEventTarget> TestEventTarget::RemoveChild(TestEventTarget *c) {
+std::unique_ptr<TestEventTarget> TestEventTarget::RemoveChild(
+    TestEventTarget* c) {
   ScopedVector<TestEventTarget>::iterator iter = std::find(children_.begin(),
                                                            children_.end(),
                                                            c);
   if (iter != children_.end()) {
     children_.weak_erase(iter);
     c->set_parent(NULL);
-    return make_scoped_ptr(c);
+    return base::WrapUnique(c);
   }
   return nullptr;
 }
 
-void TestEventTarget::SetEventTargeter(scoped_ptr<EventTargeter> targeter) {
+void TestEventTarget::SetEventTargeter(
+    std::unique_ptr<EventTargeter> targeter) {
   targeter_ = std::move(targeter);
 }
 
@@ -67,8 +70,8 @@ EventTarget* TestEventTarget::GetParentTarget() {
   return parent_;
 }
 
-scoped_ptr<EventTargetIterator> TestEventTarget::GetChildIterator() const {
-  return make_scoped_ptr(
+std::unique_ptr<EventTargetIterator> TestEventTarget::GetChildIterator() const {
+  return base::WrapUnique(
       new EventTargetIteratorImpl<TestEventTarget>(children_.get()));
 }