| 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 95261cb90fce138bc2d8b768be79098afe948c52..a27bc70779e9bbc4eee806fc814b7e4dc7f48bcd 100644
|
| --- a/remoting/host/ipc_desktop_environment_unittest.cc
|
| +++ b/remoting/host/ipc_desktop_environment_unittest.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/callback.h"
|
| @@ -417,7 +419,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() {
|
| @@ -462,7 +464,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();
|
| @@ -481,7 +483,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();
|
| @@ -507,7 +509,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();
|
| @@ -524,7 +526,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.
|
| @@ -549,7 +551,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.
|
| @@ -578,7 +580,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.
|
| @@ -605,7 +607,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.
|
| @@ -632,7 +634,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.
|
| @@ -658,7 +660,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.
|
| @@ -685,7 +687,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.
|
| @@ -727,7 +729,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.
|
|
|