| Index: remoting/host/chromoting_host_unittest.cc
|
| diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
|
| index de03e60ecb6582281b5f7f0f81c354e583217ad4..9a5de768e2936a92c278a939e4d7c4d111df6658 100644
|
| --- a/remoting/host/chromoting_host_unittest.cc
|
| +++ b/remoting/host/chromoting_host_unittest.cc
|
| @@ -121,9 +121,8 @@ class ChromotingHostTest : public testing::Test {
|
| // Helper method to pretend a client is connected to ChromotingHost.
|
| void SimulateClientConnection(int connection_index, bool authenticate,
|
| bool reject) {
|
| - scoped_ptr<protocol::ConnectionToClient> connection =
|
| - ((connection_index == 0) ? owned_connection1_ : owned_connection2_)
|
| - .Pass();
|
| + scoped_ptr<protocol::ConnectionToClient> connection = std::move(
|
| + (connection_index == 0) ? owned_connection1_ : owned_connection2_);
|
| protocol::ConnectionToClient* connection_ptr = connection.get();
|
| scoped_ptr<ClientSession> client(new ClientSession(
|
| host_.get(),
|
| @@ -133,7 +132,7 @@ class ChromotingHostTest : public testing::Test {
|
| task_runner_, // Video encode
|
| task_runner_, // Network
|
| task_runner_, // UI
|
| - connection.Pass(),
|
| + std::move(connection),
|
| desktop_environment_factory_.get(),
|
| base::TimeDelta(),
|
| nullptr,
|
|
|