Convert Pass()→std::move() in ui/

ui/events/gesture_detection/motion_event_generic.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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/gesture_detection/motion_event_generic.h"
 
 #include <cmath>
+#include <utility>
 
 #include "base/logging.h"
 #include "ui/events/base_event_utils.h"
 
 namespace ui {
 
 PointerProperties::PointerProperties()
     : PointerProperties(0, 0, 0) {
 }
 
@@ skipping 211 matching lines @@
 }
 
 // static
 scoped_ptr<MotionEventGeneric> MotionEventGeneric::CancelEvent(
     const MotionEvent& event) {
   bool with_history = false;
   scoped_ptr<MotionEventGeneric> cancel_event(
       new MotionEventGeneric(event, with_history));
   cancel_event->set_action(ACTION_CANCEL);
   cancel_event->set_unique_event_id(ui::GetNextTouchEventId());
-  return cancel_event.Pass();
+  return cancel_event;
 }
 
 size_t MotionEventGeneric::PushPointer(const PointerProperties& pointer) {
   DCHECK_EQ(0U, GetHistorySize());
   pointers_->push_back(pointer);
   return pointers_->size() - 1;
 }
 
 void MotionEventGeneric::RemovePointerAt(size_t index) {
   DCHECK_LT(index, pointers_->size());
   pointers_->erase(pointers_->begin() + index);
 }
 
 void MotionEventGeneric::PushHistoricalEvent(scoped_ptr<MotionEvent> event) {
   DCHECK(event);
   DCHECK_EQ(event->GetAction(), ACTION_MOVE);
   DCHECK_EQ(event->GetPointerCount(), GetPointerCount());
   DCHECK_EQ(event->GetAction(), GetAction());
   DCHECK_LE(event->GetEventTime().ToInternalValue(),
             GetEventTime().ToInternalValue());
-  historical_events_.push_back(event.Pass());
+  historical_events_.push_back(std::move(event));
 }
 
 MotionEventGeneric::MotionEventGeneric()
     : action_(ACTION_NONE),
       unique_event_id_(ui::GetNextTouchEventId()),
       action_index_(-1),
       button_state_(0) {
 }
 
 MotionEventGeneric::MotionEventGeneric(const MotionEvent& event,
@@ skipping 18 matching lines @@
   for (size_t h = 0; h < history_size; ++h) {
     scoped_ptr<MotionEventGeneric> historical_event(new MotionEventGeneric());
     historical_event->set_action(ACTION_MOVE);
     historical_event->set_event_time(event.GetHistoricalEventTime(h));
     for (size_t i = 0; i < pointer_count; ++i) {
       historical_event->PushPointer(
           PointerProperties(event.GetHistoricalX(i, h),
                             event.GetHistoricalY(i, h),
                             event.GetHistoricalTouchMajor(i, h)));
     }
-    PushHistoricalEvent(historical_event.Pass());
+    PushHistoricalEvent(std::move(historical_event));
   }
 }
 
 MotionEventGeneric& MotionEventGeneric::operator=(
     const MotionEventGeneric& other) {
   action_ = other.action_;
   event_time_ = other.event_time_;
   unique_event_id_ = other.unique_event_id_;
   action_index_ = other.action_index_;
   button_state_ = other.button_state_;
   flags_ = other.flags_;
   pointers_ = other.pointers_;
   const size_t history_size = other.GetHistorySize();
   for (size_t h = 0; h < history_size; ++h)
     PushHistoricalEvent(other.historical_events_[h]->Clone());
   return *this;
 }
 
 void MotionEventGeneric::PopPointer() {
   DCHECK_GT(pointers_->size(), 0U);
   pointers_->pop_back();
 }
 
 }  // namespace ui