| Index: tools/android/forwarder2/daemon.cc
|
| diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc
|
| index f362735be0d080d9a186e3783f91a889e9793c1b..e5ebe07bbf5aefffa54cb64977b9c665d474113a 100644
|
| --- a/tools/android/forwarder2/daemon.cc
|
| +++ b/tools/android/forwarder2/daemon.cc
|
| @@ -13,10 +13,10 @@
|
| #include <sys/types.h>
|
| #include <sys/wait.h>
|
| #include <unistd.h>
|
| -
|
| #include <cstdlib>
|
| #include <cstring>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| @@ -67,7 +67,7 @@ bool RunServerAcceptLoop(const std::string& welcome_message,
|
| failed = true;
|
| continue;
|
| }
|
| - server_delegate->OnClientConnected(client_socket.Pass());
|
| + server_delegate->OnClientConnected(std::move(client_socket));
|
| }
|
| return !failed;
|
| }
|
| @@ -120,7 +120,7 @@ scoped_ptr<Socket> ConnectToUnixDomainSocket(
|
| LOG(ERROR) << "Unexpected message read from daemon: " << buf;
|
| break;
|
| }
|
| - return socket.Pass();
|
| + return socket;
|
| }
|
| return scoped_ptr<Socket>();
|
| }
|
|
|