Replace scoped_ptr with std::unique_ptr in //ui

ui/events/event.cc

 // Copyright (c) 2012 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/event.h"
 
 #include <utility>
 
+#include "base/memory/ptr_util.h"
+
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #endif
 
 #include <cmath>
 #include <cstring>
 
 #include "base/metrics/histogram.h"
@@ skipping 137 matching lines @@
 }
 
 }  // namespace
 
 namespace ui {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Event
 
 // static
-scoped_ptr<Event> Event::Clone(const Event& event) {
+std::unique_ptr<Event> Event::Clone(const Event& event) {
   if (event.IsKeyEvent()) {
-    return make_scoped_ptr(new KeyEvent(static_cast<const KeyEvent&>(event)));
+    return base::WrapUnique(new KeyEvent(static_cast<const KeyEvent&>(event)));
   }
 
   if (event.IsMouseEvent()) {
     if (event.IsMouseWheelEvent()) {
-      return make_scoped_ptr(
+      return base::WrapUnique(
           new MouseWheelEvent(static_cast<const MouseWheelEvent&>(event)));
     }
 
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new MouseEvent(static_cast<const MouseEvent&>(event)));
   }
 
   if (event.IsTouchEvent()) {
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new TouchEvent(static_cast<const TouchEvent&>(event)));
   }
 
   if (event.IsGestureEvent()) {
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new GestureEvent(static_cast<const GestureEvent&>(event)));
   }
 
   if (event.IsPointerEvent()) {
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new PointerEvent(static_cast<const PointerEvent&>(event)));
   }
 
   if (event.IsScrollEvent()) {
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new ScrollEvent(static_cast<const ScrollEvent&>(event)));
   }
 
-  return make_scoped_ptr(new Event(event));
+  return base::WrapUnique(new Event(event));
 }
 
 Event::~Event() {
   if (delete_native_event_)
     ReleaseCopiedNativeEvent(native_event_);
 }
 
 bool Event::IsMousePointerEvent() const {
   return IsPointerEvent() &&
          AsPointerEvent()->pointer_details().pointer_type ==
@@ skipping 767 matching lines @@
     is_char_ = rhs.is_char_;
 
     if (rhs.extended_key_event_data_)
       extended_key_event_data_.reset(rhs.extended_key_event_data_->Clone());
   }
   return *this;
 }
 
 KeyEvent::~KeyEvent() {}
 
-void KeyEvent::SetExtendedKeyEventData(scoped_ptr<ExtendedKeyEventData> data) {
+void KeyEvent::SetExtendedKeyEventData(
+    std::unique_ptr<ExtendedKeyEventData> data) {
   extended_key_event_data_ = std::move(data);
 }
 
 void KeyEvent::ApplyLayout() const {
   ui::DomCode code = code_;
   if (code == DomCode::NONE) {
     // Catch old code that tries to do layout without a physical key, and try
     // to recover using the KeyboardCode. Once key events are fully defined
     // on construction (see TODO in event.h) this will go away.
     VLOG(2) << "DomCode::NONE keycode=" << key_code_;
@@ skipping 201 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui