Index: remoting/host/ipc_desktop_environment_unittest.cc |
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc |
index 508382de36b5a2d5de1af12c39a018cb230278e2..45dffc81275670ca1ef03bb36697ef95e48a3b31 100644 |
--- a/remoting/host/ipc_desktop_environment_unittest.cc |
+++ b/remoting/host/ipc_desktop_environment_unittest.cc |
@@ -413,7 +413,7 @@ void IpcDesktopEnvironmentTest::CreateDesktopProcess() { |
.Times(AnyNumber()) |
.WillRepeatedly(Return(false)); |
- EXPECT_TRUE(desktop_process_->Start(desktop_environment_factory.Pass())); |
+ EXPECT_TRUE(desktop_process_->Start(std::move(desktop_environment_factory))); |
} |
void IpcDesktopEnvironmentTest::DestoyDesktopProcess() { |
@@ -458,7 +458,7 @@ TEST_F(IpcDesktopEnvironmentTest, Basic) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
// Run the message loop until the desktop is attached. |
setup_run_loop_->Run(); |
@@ -477,7 +477,7 @@ TEST_F(IpcDesktopEnvironmentTest, CapabilitiesNoTouch) { |
EXPECT_EQ("rateLimitResizeRequests", desktop_environment_->GetCapabilities()); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
// Run the message loop until the desktop is attached. |
setup_run_loop_->Run(); |
@@ -503,7 +503,7 @@ TEST_F(IpcDesktopEnvironmentTest, TouchEventsCapabilities) { |
desktop_environment_->GetCapabilities()); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
// Run the message loop until the desktop is attached. |
setup_run_loop_->Run(); |
@@ -520,7 +520,7 @@ TEST_F(IpcDesktopEnvironmentTest, CaptureFrame) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |
@@ -545,7 +545,7 @@ TEST_F(IpcDesktopEnvironmentTest, Reattach) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |
@@ -574,7 +574,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectClipboardEvent) { |
this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment)); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |
@@ -601,7 +601,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectKeyEvent) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |
@@ -628,7 +628,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectTextEvent) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |
@@ -654,7 +654,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectMouseEvent) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |
@@ -681,7 +681,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectTouchEvent) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |
@@ -723,7 +723,7 @@ TEST_F(IpcDesktopEnvironmentTest, SetScreenResolution) { |
.Times(0); |
// Start the input injector and screen capturer. |
- input_injector_->Start(clipboard_stub.Pass()); |
+ input_injector_->Start(std::move(clipboard_stub)); |
video_capturer_->Start(&desktop_capturer_callback_); |
// Run the message loop until the desktop is attached. |