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

content/browser/loader/upload_data_stream_builder.cc

 // Copyright 2013 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 "content/browser/loader/upload_data_stream_builder.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 70 matching lines @@
 std::unique_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
     ResourceRequestBodyImpl* body,
     storage::BlobStorageContext* blob_context,
     storage::FileSystemContext* file_system_context,
     base::SingleThreadTaskRunner* file_task_runner) {
   std::vector<std::unique_ptr<net::UploadElementReader>> element_readers;
   for (const auto& element : *body->elements()) {
     switch (element.type()) {
       case ResourceRequestBodyImpl::Element::TYPE_BYTES:
         element_readers.push_back(
-            base::WrapUnique(new BytesElementReader(body, element)));
+            base::MakeUnique<BytesElementReader>(body, element));
         break;
       case ResourceRequestBodyImpl::Element::TYPE_FILE:
-        element_readers.push_back(base::WrapUnique(
-            new FileElementReader(body, file_task_runner, element)));
+        element_readers.push_back(base::MakeUnique<FileElementReader>(
+            body, file_task_runner, element));
         break;
       case ResourceRequestBodyImpl::Element::TYPE_FILE_FILESYSTEM:
         // If |body| contains any filesystem URLs, the caller should have
         // supplied a FileSystemContext.
         DCHECK(file_system_context);
         element_readers.push_back(
-            base::WrapUnique(new content::UploadFileSystemFileElementReader(
+            base::MakeUnique<content::UploadFileSystemFileElementReader>(
                 file_system_context, element.filesystem_url(), element.offset(),
-                element.length(), element.expected_modification_time())));
+                element.length(), element.expected_modification_time()));
         break;
       case ResourceRequestBodyImpl::Element::TYPE_BLOB: {
         DCHECK_EQ(std::numeric_limits<uint64_t>::max(), element.length());
         DCHECK_EQ(0ul, element.offset());
         std::unique_ptr<storage::BlobDataHandle> handle =
             blob_context->GetBlobDataFromUUID(element.blob_uuid());
         element_readers.push_back(
-            base::WrapUnique(new storage::UploadBlobElementReader(
-                std::move(handle), file_system_context, file_task_runner)));
+            base::MakeUnique<storage::UploadBlobElementReader>(
+                std::move(handle), file_system_context, file_task_runner));
         break;
       }
       case ResourceRequestBodyImpl::Element::TYPE_DISK_CACHE_ENTRY:
       case ResourceRequestBodyImpl::Element::TYPE_BYTES_DESCRIPTION:
       case ResourceRequestBodyImpl::Element::TYPE_UNKNOWN:
         NOTREACHED();
         break;
     }
   }
 
-  return base::WrapUnique(new net::ElementsUploadDataStream(
-      std::move(element_readers), body->identifier()));
+  return base::MakeUnique<net::ElementsUploadDataStream>(
+      std::move(element_readers), body->identifier());
 }
 
 }  // namespace content