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

content/browser/loader/upload_data_stream_builder.cc

Index: content/browser/loader/upload_data_stream_builder.cc
diff --git a/content/browser/loader/upload_data_stream_builder.cc b/content/browser/loader/upload_data_stream_builder.cc
index d9bc725532374fd6a538b5394faa3b11db81afc9..f3d79c6fd5a96fab01db0e9f76ad53a4e9e06936 100644
--- a/content/browser/loader/upload_data_stream_builder.cc
+++ b/content/browser/loader/upload_data_stream_builder.cc
@@ -88,20 +88,20 @@ std::unique_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
     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());
@@ -109,8 +109,8 @@ std::unique_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
         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:
@@ -121,8 +121,8 @@ std::unique_ptr<net::UploadDataStream> UploadDataStreamBuilder::Build(
     }
   }
 
-  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