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

Unified Diff: net/server/http_connection.h

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/sdch/sdch_owner_unittest.cc ('k') | net/server/http_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/http_connection.h
diff --git a/net/server/http_connection.h b/net/server/http_connection.h
index 8103e4e5072b39e34485351f10dbb0b19cdf640f..e708d3584fd56f2d6bbc1b990f6adfb3bc995d39 100644
--- a/net/server/http_connection.h
+++ b/net/server/http_connection.h
@@ -5,12 +5,12 @@
#ifndef NET_SERVER_HTTP_CONNECTION_H_
#define NET_SERVER_HTTP_CONNECTION_H_
+#include <memory>
#include <queue>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/io_buffer.h"
namespace net {
@@ -110,7 +110,7 @@ class HttpConnection {
DISALLOW_COPY_AND_ASSIGN(QueuedWriteIOBuffer);
};
- HttpConnection(int id, scoped_ptr<StreamSocket> socket);
+ HttpConnection(int id, std::unique_ptr<StreamSocket> socket);
~HttpConnection();
int id() const { return id_; }
@@ -119,15 +119,15 @@ class HttpConnection {
QueuedWriteIOBuffer* write_buf() const { return write_buf_.get(); }
WebSocket* web_socket() const { return web_socket_.get(); }
- void SetWebSocket(scoped_ptr<WebSocket> web_socket);
+ void SetWebSocket(std::unique_ptr<WebSocket> web_socket);
private:
const int id_;
- const scoped_ptr<StreamSocket> socket_;
+ const std::unique_ptr<StreamSocket> socket_;
const scoped_refptr<ReadIOBuffer> read_buf_;
const scoped_refptr<QueuedWriteIOBuffer> write_buf_;
- scoped_ptr<WebSocket> web_socket_;
+ std::unique_ptr<WebSocket> web_socket_;
DISALLOW_COPY_AND_ASSIGN(HttpConnection);
};
« no previous file with comments | « net/sdch/sdch_owner_unittest.cc ('k') | net/server/http_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698