Index: remoting/host/security_key/gnubby_socket.cc |
diff --git a/remoting/host/security_key/gnubby_socket.cc b/remoting/host/security_key/gnubby_socket.cc |
index 371a3529e1a9b92a3ec4836a5b7cf92b6e6f0d55..28a210641ec54d3884ae93b602d4f87761c64765 100644 |
--- a/remoting/host/security_key/gnubby_socket.cc |
+++ b/remoting/host/security_key/gnubby_socket.cc |
@@ -26,7 +26,7 @@ const char kSshError[] = {0x05}; |
} // namespace |
-GnubbySocket::GnubbySocket(scoped_ptr<net::StreamSocket> socket, |
+GnubbySocket::GnubbySocket(std::unique_ptr<net::StreamSocket> socket, |
base::TimeDelta timeout, |
const base::Closure& timeout_callback) |
: socket_(std::move(socket)), |
@@ -59,7 +59,7 @@ void GnubbySocket::SendResponse(const std::string& response_data) { |
std::string response_length_string = GetResponseLengthAsBytes(response_data); |
int response_len = response_length_string.size() + response_data.size(); |
- scoped_ptr<std::string> response( |
+ std::unique_ptr<std::string> response( |
new std::string(response_length_string + response_data)); |
write_buffer_ = new net::DrainableIOBuffer( |
new net::StringIOBuffer(std::move(response)), response_len); |