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

Unified Diff: net/server/web_socket_encoder.cc

Issue 2259823002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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.cc ('k') | net/socket/fuzzed_socket_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/web_socket_encoder.cc
diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc
index 60a9a47021c8181376504724f090c7099cdca39a..693de733b699239f8ade0c593139733801a7526e 100644
--- a/net/server/web_socket_encoder.cc
+++ b/net/server/web_socket_encoder.cc
@@ -219,10 +219,10 @@ std::unique_ptr<WebSocketEncoder> WebSocketEncoder::CreateServer(
}
DCHECK(response.IsValidAsResponse());
DCHECK(offer.IsCompatibleWith(response));
- auto deflater = base::WrapUnique(
- new WebSocketDeflater(response.server_context_take_over_mode()));
- auto inflater = base::WrapUnique(
- new WebSocketInflater(kInflaterChunkSize, kInflaterChunkSize));
+ auto deflater = base::MakeUnique<WebSocketDeflater>(
+ response.server_context_take_over_mode());
+ auto inflater = base::MakeUnique<WebSocketInflater>(kInflaterChunkSize,
+ kInflaterChunkSize);
if (!deflater->Initialize(response.PermissiveServerMaxWindowBits()) ||
!inflater->Initialize(response.PermissiveClientMaxWindowBits())) {
// For some reason we cannot accept the parameters.
@@ -265,10 +265,10 @@ std::unique_ptr<WebSocketEncoder> WebSocketEncoder::CreateClient(
return base::WrapUnique(new WebSocketEncoder(FOR_CLIENT, nullptr, nullptr));
}
- auto deflater = base::WrapUnique(
- new WebSocketDeflater(params.client_context_take_over_mode()));
- auto inflater = base::WrapUnique(
- new WebSocketInflater(kInflaterChunkSize, kInflaterChunkSize));
+ auto deflater = base::MakeUnique<WebSocketDeflater>(
+ params.client_context_take_over_mode());
+ auto inflater = base::MakeUnique<WebSocketInflater>(kInflaterChunkSize,
+ kInflaterChunkSize);
if (!deflater->Initialize(params.PermissiveClientMaxWindowBits()) ||
!inflater->Initialize(params.PermissiveServerMaxWindowBits())) {
// TODO (yhirano): Fail the connection.
« no previous file with comments | « net/server/http_server.cc ('k') | net/socket/fuzzed_socket_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698