| Index: chrome/browser/devtools/device/self_device_provider.cc
|
| diff --git a/chrome/browser/devtools/device/self_device_provider.cc b/chrome/browser/devtools/device/self_device_provider.cc
|
| index f6930b56353e13aa88a3f664617468b883adc591..ee0f0433594bea890f4f729e9f696049d12c7499 100644
|
| --- a/chrome/browser/devtools/device/self_device_provider.cc
|
| +++ b/chrome/browser/devtools/device/self_device_provider.cc
|
| @@ -17,9 +17,9 @@
|
|
|
| static void RunSocketCallback(
|
| const AndroidDeviceManager::SocketCallback& callback,
|
| - scoped_ptr<net::StreamSocket> socket,
|
| + net::StreamSocket* socket,
|
| int result) {
|
| - callback.Run(result, socket.Pass());
|
| + callback.Run(result, socket);
|
| }
|
|
|
| } // namespace
|
| @@ -61,8 +61,7 @@
|
| base::StringToInt(socket_name, &port);
|
| net::AddressList address_list =
|
| net::AddressList::CreateFromIPAddress(ip_number, port);
|
| - scoped_ptr<net::StreamSocket> socket(new net::TCPClientSocket(
|
| - address_list, NULL, net::NetLog::Source()));
|
| - socket->Connect(
|
| - base::Bind(&RunSocketCallback, callback, base::Passed(&socket)));
|
| + net::TCPClientSocket* socket = new net::TCPClientSocket(
|
| + address_list, NULL, net::NetLog::Source());
|
| + socket->Connect(base::Bind(&RunSocketCallback, callback, socket));
|
| }
|
|
|