Replace brillo::make_unique_ptr with base::MakeUnique/base::WrapUnique.
base::MakeUnique mimics std::make_unique and is preferred over
brillo::make_unique_ptr (which is identical to base::WrapUnique).
brillo::make_unique_ptr will eventually be deprecated and removed as its
functionality is well covered by base::MakeUnique and base::WrapUnique.
BUG=chromium:704644
TEST=Run unit tests.
Change-Id: I771b312d04643a1c74dd843947ed30bda510eed2
Reviewed-on: https://chromium-review.googlesource.com/458562
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Reviewed-by: Alex Deymo <deymo@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
diff --git a/payload_consumer/bzip_extent_writer_unittest.cc b/payload_consumer/bzip_extent_writer_unittest.cc
index 8ac3e59..6b5e1c0 100644
--- a/payload_consumer/bzip_extent_writer_unittest.cc
+++ b/payload_consumer/bzip_extent_writer_unittest.cc
@@ -22,7 +22,7 @@
#include <string>
#include <vector>
-#include <brillo/make_unique_ptr.h>
+#include <base/memory/ptr_util.h>
#include <gtest/gtest.h>
#include "update_engine/common/test_utils.h"
@@ -70,8 +70,7 @@
0x22, 0x9c, 0x28, 0x48, 0x66, 0x61, 0xb8, 0xea, 0x00,
};
- BzipExtentWriter bzip_writer(
- brillo::make_unique_ptr(new DirectExtentWriter()));
+ BzipExtentWriter bzip_writer(base::MakeUnique<DirectExtentWriter>());
EXPECT_TRUE(bzip_writer.Init(fd_, extents, kBlockSize));
EXPECT_TRUE(bzip_writer.Write(test, sizeof(test)));
EXPECT_TRUE(bzip_writer.End());
@@ -108,8 +107,7 @@
extent.set_num_blocks((kDecompressedLength + kBlockSize - 1) / kBlockSize);
extents.push_back(extent);
- BzipExtentWriter bzip_writer(
- brillo::make_unique_ptr(new DirectExtentWriter()));
+ BzipExtentWriter bzip_writer(base::MakeUnique<DirectExtentWriter>());
EXPECT_TRUE(bzip_writer.Init(fd_, extents, kBlockSize));
brillo::Blob original_compressed_data = compressed_data;
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index b7906f6..9b7eea3 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -28,11 +28,11 @@
#include <base/files/file_util.h>
#include <base/format_macros.h>
+#include <base/memory/ptr_util.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
#include <brillo/data_encoding.h>
-#include <brillo/make_unique_ptr.h>
#include <bsdiff/bspatch.h>
#include <google/protobuf/repeated_field.h>
@@ -910,9 +910,8 @@
}
// Setup the ExtentWriter stack based on the operation type.
- std::unique_ptr<ExtentWriter> writer =
- brillo::make_unique_ptr(new ZeroPadExtentWriter(
- brillo::make_unique_ptr(new DirectExtentWriter())));
+ std::unique_ptr<ExtentWriter> writer = base::MakeUnique<ZeroPadExtentWriter>(
+ base::MakeUnique<DirectExtentWriter>());
if (operation.type() == InstallOperation::REPLACE_BZ) {
writer.reset(new BzipExtentWriter(std::move(writer)));
diff --git a/payload_consumer/extent_writer_unittest.cc b/payload_consumer/extent_writer_unittest.cc
index 24d238e..f9304a3 100644
--- a/payload_consumer/extent_writer_unittest.cc
+++ b/payload_consumer/extent_writer_unittest.cc
@@ -22,7 +22,7 @@
#include <string>
#include <vector>
-#include <brillo/make_unique_ptr.h>
+#include <base/memory/ptr_util.h>
#include <brillo/secure_blob.h>
#include <gtest/gtest.h>
@@ -184,8 +184,7 @@
brillo::Blob data(kBlockSize * 2);
test_utils::FillWithData(&data);
- ZeroPadExtentWriter zero_pad_writer(
- brillo::make_unique_ptr(new DirectExtentWriter()));
+ ZeroPadExtentWriter zero_pad_writer(base::MakeUnique<DirectExtentWriter>());
EXPECT_TRUE(zero_pad_writer.Init(fd_, extents, kBlockSize));
size_t bytes_to_write = data.size();
diff --git a/payload_consumer/xz_extent_writer_unittest.cc b/payload_consumer/xz_extent_writer_unittest.cc
index fb8bb40..47c0a58 100644
--- a/payload_consumer/xz_extent_writer_unittest.cc
+++ b/payload_consumer/xz_extent_writer_unittest.cc
@@ -25,7 +25,7 @@
#include <string>
#include <vector>
-#include <brillo/make_unique_ptr.h>
+#include <base/memory/ptr_util.h>
#include <gtest/gtest.h>
#include "update_engine/common/test_utils.h"
@@ -88,8 +88,7 @@
protected:
void SetUp() override {
fake_extent_writer_ = new FakeExtentWriter();
- xz_writer_.reset(
- new XzExtentWriter(brillo::make_unique_ptr(fake_extent_writer_)));
+ xz_writer_.reset(new XzExtentWriter(base::WrapUnique(fake_extent_writer_)));
}
void WriteAll(const brillo::Blob& compressed) {