| Index: content/browser/devtools/tethering_handler.cc
|
| diff --git a/content/browser/devtools/tethering_handler.cc b/content/browser/devtools/tethering_handler.cc
|
| index 711adcd2d721088d3fc60d0b5a465fe8cce52abf..d3e787d0c01245abdee4243f97b099f600715f6a 100644
|
| --- a/content/browser/devtools/tethering_handler.cc
|
| +++ b/content/browser/devtools/tethering_handler.cc
|
| @@ -61,7 +61,7 @@ class SocketPump : public net::StreamListenSocket::Delegate {
|
|
|
| private:
|
| virtual void DidAccept(net::StreamListenSocket* server,
|
| - net::StreamListenSocket* socket) OVERRIDE {
|
| + scoped_ptr<net::StreamListenSocket> socket) OVERRIDE {
|
| if (accepted_socket_.get())
|
| return;
|
|
|
| @@ -69,7 +69,7 @@ class SocketPump : public net::StreamListenSocket::Delegate {
|
| wire_buffer_ = new net::GrowableIOBuffer();
|
| wire_buffer_->SetCapacity(kBufferSize);
|
|
|
| - accepted_socket_ = socket;
|
| + accepted_socket_ = socket.Pass();
|
| int result = client_socket_->Read(
|
| buffer_.get(),
|
| kBufferSize,
|
| @@ -158,8 +158,8 @@ class SocketPump : public net::StreamListenSocket::Delegate {
|
|
|
| private:
|
| scoped_ptr<net::StreamSocket> client_socket_;
|
| - scoped_refptr<net::StreamListenSocket> server_socket_;
|
| - scoped_refptr<net::StreamListenSocket> accepted_socket_;
|
| + scoped_ptr<net::StreamListenSocket> server_socket_;
|
| + scoped_ptr<net::StreamListenSocket> accepted_socket_;
|
| scoped_refptr<net::IOBuffer> buffer_;
|
| scoped_refptr<net::GrowableIOBuffer> wire_buffer_;
|
| DevToolsHttpHandlerDelegate* delegate_;
|
|
|