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

Unified Diff: net/server/web_socket_encoder.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/web_socket.h ('k') | net/server/web_socket_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/web_socket_encoder.h
diff --git a/net/server/web_socket_encoder.h b/net/server/web_socket_encoder.h
index caeec9465994924c45c075855f591cdf7b1528a6..af8122845d78c77909dbcdde5338ed5a2cb2fd77 100644
--- a/net/server/web_socket_encoder.h
+++ b/net/server/web_socket_encoder.h
@@ -5,10 +5,10 @@
#ifndef NET_SERVER_WEB_SOCKET_ENCODER_H_
#define NET_SERVER_WEB_SOCKET_ENCODER_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
#include "net/server/web_socket.h"
#include "net/websockets/websocket_deflater.h"
@@ -25,14 +25,14 @@ class WebSocketEncoder final {
~WebSocketEncoder();
// Creates and returns an encoder for a server without extensions.
- static scoped_ptr<WebSocketEncoder> CreateServer();
+ static std::unique_ptr<WebSocketEncoder> CreateServer();
// Creates and returns an encoder.
// |extensions| is the value of a Sec-WebSocket-Extensions header.
// Returns nullptr when there is an error.
- static scoped_ptr<WebSocketEncoder> CreateServer(
+ static std::unique_ptr<WebSocketEncoder> CreateServer(
const std::string& extensions,
WebSocketDeflateParameters* params);
- static scoped_ptr<WebSocketEncoder> CreateClient(
+ static std::unique_ptr<WebSocketEncoder> CreateClient(
const std::string& response_extensions);
WebSocket::ParseResult DecodeFrame(const base::StringPiece& frame,
@@ -51,15 +51,15 @@ class WebSocketEncoder final {
};
WebSocketEncoder(Type type,
- scoped_ptr<WebSocketDeflater> deflater,
- scoped_ptr<WebSocketInflater> inflater);
+ std::unique_ptr<WebSocketDeflater> deflater,
+ std::unique_ptr<WebSocketInflater> inflater);
bool Inflate(std::string* message);
bool Deflate(const std::string& message, std::string* output);
Type type_;
- scoped_ptr<WebSocketDeflater> deflater_;
- scoped_ptr<WebSocketInflater> inflater_;
+ std::unique_ptr<WebSocketDeflater> deflater_;
+ std::unique_ptr<WebSocketInflater> inflater_;
DISALLOW_COPY_AND_ASSIGN(WebSocketEncoder);
};
« no previous file with comments | « net/server/web_socket.h ('k') | net/server/web_socket_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698