| 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);
|
|
|