| Index: device/bluetooth/bluetooth_socket_win.cc
|
| diff --git a/device/bluetooth/bluetooth_socket_win.cc b/device/bluetooth/bluetooth_socket_win.cc
|
| index 49886a3d8f14e37d016519d97dd2ff041ca1240b..509ade4ab79af1b9066abb5a0e4957d656fe09bb 100644
|
| --- a/device/bluetooth/bluetooth_socket_win.cc
|
| +++ b/device/bluetooth/bluetooth_socket_win.cc
|
| @@ -7,6 +7,7 @@
|
| #include <objbase.h>
|
|
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/ref_counted.h"
|
| @@ -225,7 +226,7 @@ void BluetoothSocketWin::DoConnect(
|
| return;
|
| }
|
|
|
| - SetTCPSocket(scoped_socket.Pass());
|
| + SetTCPSocket(std::move(scoped_socket));
|
| success_callback.Run();
|
| }
|
|
|
| @@ -325,8 +326,8 @@ void BluetoothSocketWin::DoListen(
|
| return;
|
| }
|
|
|
| - SetTCPSocket(scoped_socket.Pass());
|
| - service_reg_data_ = reg_data.Pass();
|
| + SetTCPSocket(std::move(scoped_socket));
|
| + service_reg_data_ = std::move(reg_data);
|
|
|
| PostSuccess(success_callback);
|
| }
|
| @@ -388,7 +389,7 @@ void BluetoothSocketWin::OnAcceptOnUI(
|
|
|
| scoped_refptr<BluetoothSocketWin> peer_socket =
|
| CreateBluetoothSocket(ui_task_runner(), socket_thread());
|
| - peer_socket->SetTCPSocket(accept_socket.Pass());
|
| + peer_socket->SetTCPSocket(std::move(accept_socket));
|
| success_callback.Run(peer_device, peer_socket);
|
| }
|
|
|
|
|