| Index: remoting/host/touch_injector_win_unittest.cc
|
| diff --git a/remoting/host/touch_injector_win_unittest.cc b/remoting/host/touch_injector_win_unittest.cc
|
| index 791b95fcca045670d65c26f497d956167df6f0a7..336dbbd3ee66f890be3bcf521960de97a967f0a8 100644
|
| --- a/remoting/host/touch_injector_win_unittest.cc
|
| +++ b/remoting/host/touch_injector_win_unittest.cc
|
| @@ -136,7 +136,7 @@ TEST(TouchInjectorWinTest, CheckConversionWithPressure) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(event);
|
|
|
| @@ -190,7 +190,7 @@ TEST(TouchInjectorWinTest, CheckConversionNoPressure) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(event);
|
| }
|
| @@ -209,7 +209,7 @@ TEST(TouchInjectorWinTest, InitFailed) {
|
| EXPECT_CALL(*delegate_mock, InjectTouchInput(_, _)).Times(0);
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_FALSE(injector.Init());
|
| injector.InjectTouchEvent(event);
|
| }
|
| @@ -255,13 +255,15 @@ TEST(TouchInjectorWinTest, Reinitialize) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock_before_deinitialize.Pass());
|
| + injector.SetInjectorDelegateForTest(
|
| + std::move(delegate_mock_before_deinitialize));
|
|
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(first_event);
|
| injector.Deinitialize();
|
|
|
| - injector.SetInjectorDelegateForTest(delegate_mock_after_deinitialize.Pass());
|
| + injector.SetInjectorDelegateForTest(
|
| + std::move(delegate_mock_after_deinitialize));
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(second_event);
|
| }
|
| @@ -288,7 +290,7 @@ TEST(TouchInjectorWinTest, StartTouchPoint) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(event);
|
| }
|
| @@ -322,7 +324,7 @@ TEST(TouchInjectorWinTest, MoveTouchPoint) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(event);
|
| event.set_event_type(TouchEvent::TOUCH_POINT_MOVE);
|
| @@ -357,7 +359,7 @@ TEST(TouchInjectorWinTest, EndTouchPoint) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(event);
|
| event.set_event_type(TouchEvent::TOUCH_POINT_END);
|
| @@ -392,7 +394,7 @@ TEST(TouchInjectorWinTest, CancelTouchPoint) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_TRUE(injector.Init());
|
| injector.InjectTouchEvent(event);
|
| event.set_event_type(TouchEvent::TOUCH_POINT_CANCEL);
|
| @@ -461,7 +463,7 @@ TEST(TouchInjectorWinTest, MultiTouch) {
|
| .WillOnce(Return(1));
|
|
|
| TouchInjectorWin injector;
|
| - injector.SetInjectorDelegateForTest(delegate_mock.Pass());
|
| + injector.SetInjectorDelegateForTest(std::move(delegate_mock));
|
| EXPECT_TRUE(injector.Init());
|
|
|
| // Start first touch point.
|
|
|