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

Unified Diff: net/tools/quic/quic_server.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/tools/quic/quic_packet_writer_wrapper.h ('k') | net/tools/quic/quic_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/quic_server.h
diff --git a/net/tools/quic/quic_server.h b/net/tools/quic/quic_server.h
index 24523ded14fc777c0c9d0e93236ee1c7cdba77da..76ff17a45b077a4cc60c4f98424ede57f6ac5d3a 100644
--- a/net/tools/quic/quic_server.h
+++ b/net/tools/quic/quic_server.h
@@ -13,8 +13,9 @@
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/ip_endpoint.h"
#include "net/quic/crypto/quic_crypto_server_config.h"
#include "net/quic/quic_chromium_connection_helper.h"
@@ -94,7 +95,7 @@ class QuicServer : public EpollCallbackInterface {
void Initialize();
// Accepts data from the framer and demuxes clients to sessions.
- scoped_ptr<QuicDispatcher> dispatcher_;
+ std::unique_ptr<QuicDispatcher> dispatcher_;
// Frames incoming packets and hands them to the dispatcher.
EpollServer epoll_server_;
@@ -129,7 +130,7 @@ class QuicServer : public EpollCallbackInterface {
// Point to a QuicPacketReader object on the heap. The reader allocates more
// space than allowed on the stack.
- scoped_ptr<QuicPacketReader> packet_reader_;
+ std::unique_ptr<QuicPacketReader> packet_reader_;
DISALLOW_COPY_AND_ASSIGN(QuicServer);
};
« no previous file with comments | « net/tools/quic/quic_packet_writer_wrapper.h ('k') | net/tools/quic/quic_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698