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

Unified Diff: net/server/web_socket.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/server/http_server_unittest.cc ('k') | net/server/web_socket_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/web_socket.h
diff --git a/net/server/web_socket.h b/net/server/web_socket.h
index 19e9c71a5dcdc3d6e4d37a680cc25a82c348eb71..aa01f11e16334e4a2f2205abfb7476de5210f7b2 100644
--- a/net/server/web_socket.h
+++ b/net/server/web_socket.h
@@ -5,10 +5,10 @@
#ifndef NET_SERVER_WEB_SOCKET_H_
#define NET_SERVER_WEB_SOCKET_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
namespace net {
@@ -40,7 +40,7 @@ class WebSocket final {
HttpServer* const server_;
HttpConnection* const connection_;
- scoped_ptr<WebSocketEncoder> encoder_;
+ std::unique_ptr<WebSocketEncoder> encoder_;
bool closed_;
DISALLOW_COPY_AND_ASSIGN(WebSocket);
« no previous file with comments | « net/server/http_server_unittest.cc ('k') | net/server/web_socket_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698