Replace base::MakeUnique with std::make_unique in net/.
base/memory/ptr_util.h includes will be cleaned up later.
Bug: 755727
Change-Id: Ibaf46f05c9b02b76f9a91e819984b087a8c0d434
Reviewed-on: https://chromium-review.googlesource.com/627300
Commit-Queue: Jeremy Roman <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Bence Béky <[email protected]>
Cr-Commit-Position: refs/heads/master@{#498123}
diff --git a/net/server/web_socket_encoder.cc b/net/server/web_socket_encoder.cc
index 114eb36..2b30548e 100644
--- a/net/server/web_socket_encoder.cc
+++ b/net/server/web_socket_encoder.cc
@@ -218,9 +218,9 @@
}
DCHECK(response.IsValidAsResponse());
DCHECK(offer.IsCompatibleWith(response));
- auto deflater = base::MakeUnique<WebSocketDeflater>(
+ auto deflater = std::make_unique<WebSocketDeflater>(
response.server_context_take_over_mode());
- auto inflater = base::MakeUnique<WebSocketInflater>(kInflaterChunkSize,
+ auto inflater = std::make_unique<WebSocketInflater>(kInflaterChunkSize,
kInflaterChunkSize);
if (!deflater->Initialize(response.PermissiveServerMaxWindowBits()) ||
!inflater->Initialize(response.PermissiveClientMaxWindowBits())) {
@@ -264,9 +264,9 @@
return base::WrapUnique(new WebSocketEncoder(FOR_CLIENT, nullptr, nullptr));
}
- auto deflater = base::MakeUnique<WebSocketDeflater>(
+ auto deflater = std::make_unique<WebSocketDeflater>(
params.client_context_take_over_mode());
- auto inflater = base::MakeUnique<WebSocketInflater>(kInflaterChunkSize,
+ auto inflater = std::make_unique<WebSocketInflater>(kInflaterChunkSize,
kInflaterChunkSize);
if (!deflater->Initialize(params.PermissiveClientMaxWindowBits()) ||
!inflater->Initialize(params.PermissiveServerMaxWindowBits())) {