Re-write many calls to WrapUnique() with MakeUnique()

net/server/web_socket_encoder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/server/web_socket_encoder.h"
 
 #include <limits>
 #include <utility>
 #include <vector>
 
@@ skipping 201 matching lines @@
     }
 
     WebSocketDeflateParameters response = offer;
     if (offer.is_client_max_window_bits_specified() &&
         !offer.has_client_max_window_bits_value()) {
       // We need to choose one value for the response.
       response.SetClientMaxWindowBits(15);
     }
     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.
       continue;
     }
     *deflate_parameters = response;
     return base::WrapUnique(new WebSocketEncoder(
         FOR_SERVER, std::move(deflater), std::move(inflater)));
   }
 
@@ skipping 22 matching lines @@
   }
   const auto& extension = parser.extensions()[0];
   WebSocketDeflateParameters params;
   std::string failure_message;
   if (!params.Initialize(extension, &failure_message) ||
       !params.IsValidAsResponse(&failure_message)) {
     // TODO (yhirano): Fail the connection.
     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.
     return base::WrapUnique(new WebSocketEncoder(FOR_CLIENT, nullptr, nullptr));
   }
 
   return base::WrapUnique(new WebSocketEncoder(FOR_CLIENT, std::move(deflater),
                                                std::move(inflater)));
 }
 
@@ skipping 64 matching lines @@
     return false;
   scoped_refptr<IOBufferWithSize> buffer =
       deflater_->GetOutput(deflater_->CurrentOutputSize());
   if (!buffer.get())
     return false;
   *output = std::string(buffer->data(), buffer->size());
   return true;
 }
 
 }  // namespace net