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

ui/events/gesture_detection/motion_event_generic_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.
 
 // 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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
-#include "ui/events/gesture_detection/motion_event_generic.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
 namespace ui {
 
 TEST(MotionEventGenericTest, Basic) {
   base::TimeTicks event_time = base::TimeTicks::Now();
   MotionEventGeneric event(
       MotionEvent::ACTION_DOWN, event_time, PointerProperties());
   EXPECT_EQ(1U, event.GetPointerCount());
   EXPECT_EQ(0U, event.GetHistorySize());
@@ skipping 77 matching lines @@
   base::TimeTicks historical_event_time =
       event_time - base::TimeDelta::FromMilliseconds(5);
 
   PointerProperties pointer(8.3f, 4.7f, 10.1f);
   MotionEventGeneric event(MotionEvent::ACTION_MOVE, event_time, pointer);
 
   PointerProperties historical_pointer(3.4f, -4.3f, 11.5);
   scoped_ptr<MotionEvent> historical_event(new MotionEventGeneric(
       MotionEvent::ACTION_MOVE, historical_event_time, historical_pointer));
 
-  event.PushHistoricalEvent(historical_event.Pass());
+  event.PushHistoricalEvent(std::move(historical_event));
   EXPECT_EQ(1U, event.GetHistorySize());
 
   scoped_ptr<MotionEvent> clone = event.Clone();
   ASSERT_TRUE(clone);
   EXPECT_EQ(event.GetUniqueEventId(), clone->GetUniqueEventId());
   EXPECT_EQ(test::ToString(event), test::ToString(*clone));
 }
 
 TEST(MotionEventGenericTest, Cancel) {
   MotionEventGeneric event(MotionEvent::ACTION_UP,
@@ skipping 133 matching lines @@
   scoped_ptr<MotionEventGeneric> historical_event0(new MotionEventGeneric(
       MotionEvent::ACTION_MOVE, historical_event_time0, pointer0));
   historical_event0->PushPointer(pointer1);
 
   pointer0.x += 100;
   pointer1.x -= 100;
   scoped_ptr<MotionEventGeneric> historical_event1(new MotionEventGeneric(
       MotionEvent::ACTION_MOVE, historical_event_time1, pointer0));
   historical_event1->PushPointer(pointer1);
 
-  event.PushHistoricalEvent(historical_event0.Pass());
-  event.PushHistoricalEvent(historical_event1.Pass());
+  event.PushHistoricalEvent(std::move(historical_event0));
+  event.PushHistoricalEvent(std::move(historical_event1));
   ASSERT_EQ(2U, event.GetHistorySize());
   ASSERT_EQ(2U, event.GetPointerCount());
 
   // Do a basic smoke exercise of event stringification to ensure things don't
   // explode in the process.
   std::string event_string = test::ToString(event);
   EXPECT_FALSE(event_string.empty());
 }
 
 }  // namespace ui