| Index: tools/android/forwarder2/forwarders_manager.cc
|
| diff --git a/tools/android/forwarder2/forwarders_manager.cc b/tools/android/forwarder2/forwarders_manager.cc
|
| index bd15d2dd9aa533d14babb367187e15d0d55b91fd..fb6890fe20d7086b5cb4dbf35f723b7e8e71449d 100644
|
| --- a/tools/android/forwarder2/forwarders_manager.cc
|
| +++ b/tools/android/forwarder2/forwarders_manager.cc
|
| @@ -7,8 +7,8 @@
|
| #include <stddef.h>
|
| #include <sys/select.h>
|
| #include <unistd.h>
|
| -
|
| #include <algorithm>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/callback_helpers.h"
|
| @@ -50,7 +50,7 @@ void ForwardersManager::CreateNewForwarderOnInternalThread(
|
| scoped_ptr<Socket> socket1,
|
| scoped_ptr<Socket> socket2) {
|
| DCHECK(thread_.task_runner()->RunsTasksOnCurrentThread());
|
| - forwarders_.push_back(new Forwarder(socket1.Pass(), socket2.Pass()));
|
| + forwarders_.push_back(new Forwarder(std::move(socket1), std::move(socket2)));
|
| }
|
|
|
| void ForwardersManager::WaitForEventsOnInternalThreadSoon() {
|
|
|