| Index: extensions/browser/api/socket/tls_socket.h
|
| diff --git a/extensions/browser/api/socket/tls_socket.h b/extensions/browser/api/socket/tls_socket.h
|
| index 2bd5ea7c392a853faba6ab2afa2ef287bc457e69..2f7a683efb46343a724b75620e1128d233777681 100644
|
| --- a/extensions/browser/api/socket/tls_socket.h
|
| +++ b/extensions/browser/api/socket/tls_socket.h
|
| @@ -36,9 +36,9 @@ class TLSSocket;
|
| // touch any socket state.
|
| class TLSSocket : public ResumableTCPSocket {
|
| public:
|
| - typedef base::Callback<void(scoped_ptr<TLSSocket>, int)> SecureCallback;
|
| + typedef base::Callback<void(std::unique_ptr<TLSSocket>, int)> SecureCallback;
|
|
|
| - TLSSocket(scoped_ptr<net::StreamSocket> tls_socket,
|
| + TLSSocket(std::unique_ptr<net::StreamSocket> tls_socket,
|
| const std::string& owner_extension_id);
|
|
|
| ~TLSSocket() override;
|
| @@ -110,7 +110,7 @@ class TLSSocket : public ResumableTCPSocket {
|
| void OnReadComplete(const scoped_refptr<net::IOBuffer>& io_buffer,
|
| int result);
|
|
|
| - scoped_ptr<net::StreamSocket> tls_socket_;
|
| + std::unique_ptr<net::StreamSocket> tls_socket_;
|
| ReadCompletionCallback read_callback_;
|
| };
|
|
|
|
|