| Index: chrome/browser/devtools/device/port_forwarding_controller.cc
|
| diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
|
| index a03c69d7b3301be727e0cdb08449e9f7d30847fd..943f615e53a1d9a82df22f954aaaecc0c0ed262b 100644
|
| --- a/chrome/browser/devtools/device/port_forwarding_controller.cc
|
| +++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/devtools/device/port_forwarding_controller.h"
|
|
|
| #include <map>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/compiler_specific.h"
|
| @@ -54,14 +55,14 @@ class SocketTunnel : public base::NonThreadSafe {
|
| int result,
|
| scoped_ptr<net::StreamSocket> socket) {
|
| if (result == net::OK)
|
| - new SocketTunnel(socket.Pass(), host, port);
|
| + new SocketTunnel(std::move(socket), host, port);
|
| }
|
|
|
| private:
|
| SocketTunnel(scoped_ptr<net::StreamSocket> socket,
|
| const std::string& host,
|
| int port)
|
| - : remote_socket_(socket.Pass()),
|
| + : remote_socket_(std::move(socket)),
|
| pending_writes_(0),
|
| pending_destruction_(false) {
|
| host_resolver_ = net::HostResolver::CreateDefaultResolver(nullptr);
|
| @@ -336,7 +337,7 @@ void PortForwardingController::Connection::SendCommand(
|
| }
|
|
|
| web_socket_->SendFrame(
|
| - DevToolsProtocol::SerializeCommand(id, method, params.Pass()));
|
| + DevToolsProtocol::SerializeCommand(id, method, std::move(params)));
|
| }
|
|
|
| bool PortForwardingController::Connection::ProcessResponse(
|
|
|