Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: net/server/http_connection.cc

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/server/http_connection.h ('k') | net/server/http_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/http_connection.cc
diff --git a/net/server/http_connection.cc b/net/server/http_connection.cc
index d4d16cae191da84e5376c9b7241d63c135cf5a46..69330438f4e3c4febcfd4b348c2c3d52335fc9e4 100644
--- a/net/server/http_connection.cc
+++ b/net/server/http_connection.cc
@@ -150,7 +150,7 @@ int HttpConnection::QueuedWriteIOBuffer::GetSizeToWrite() const {
return pending_data_.front().size() - consumed;
}
-HttpConnection::HttpConnection(int id, scoped_ptr<StreamSocket> socket)
+HttpConnection::HttpConnection(int id, std::unique_ptr<StreamSocket> socket)
: id_(id),
socket_(std::move(socket)),
read_buf_(new ReadIOBuffer()),
@@ -159,7 +159,7 @@ HttpConnection::HttpConnection(int id, scoped_ptr<StreamSocket> socket)
HttpConnection::~HttpConnection() {
}
-void HttpConnection::SetWebSocket(scoped_ptr<WebSocket> web_socket) {
+void HttpConnection::SetWebSocket(std::unique_ptr<WebSocket> web_socket) {
DCHECK(!web_socket_);
web_socket_ = std::move(web_socket);
}
« no previous file with comments | « net/server/http_connection.h ('k') | net/server/http_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698