commit b744f9e82eb8138a857aaf3db276d0410b8c21b0
author Florian Mayer <fmayer@google.com> Wed Dec 01 01:23:10 2021 +0000
committer Florian Mayer <fmayer@google.com> Tue Dec 07 19:11:04 2021 +0000
tree a2f82d0a6b7d3aef51f125d7ca7fb8fe788da969
parent 1223f16e4456c16825a36e609a2d63c058da28fc

Fix DeltaDiffUtilsTest creating object that captures temporaries by reference.

Bug: 208505833
Change-Id: Ifec239d5e21ada43f45e9e86a03cdad28cac4912

payload_generator/delta_diff_utils_unittest.cc

diff --git a/payload_generator/delta_diff_utils_unittest.cc b/payload_generator/delta_diff_utils_unittest.cc
index 0c7e690..489081b 100644
--- a/payload_generator/delta_diff_utils_unittest.cc
+++ b/payload_generator/delta_diff_utils_unittest.cc
@@ -324,15 +324,19 @@
 
   brillo::Blob data;
   AnnotatedOperation aop;
+
+  std::vector<puffin::BitExtent> empty;
+  PayloadGenerationConfig config{
+      .version = PayloadVersion(kBrilloMajorPayloadVersion,
+                                kBrotliBsdiffMinorPayloadVersion)};
   ASSERT_TRUE(diff_utils::ReadExtentsToDiff(
       old_part_.path,
       new_part_.path,
       old_extents,
       new_extents,
-      {},  // old_deflates
-      {},  // new_deflates
-      {.version = PayloadVersion(kBrilloMajorPayloadVersion,
-                                 kBrotliBsdiffMinorPayloadVersion)},
+      empty,  // old_deflates
+      empty,  // new_deflates
+      config,
       &data,
       &aop));
   auto& op = aop.op;
@@ -365,15 +369,18 @@
   // Zucchini is only enabled on files with certain extensions
   aop.name = "data.so";
 
+  std::vector<puffin::BitExtent> empty;
+  PayloadGenerationConfig config{
+      .version = PayloadVersion(kBrilloMajorPayloadVersion,
+                                kZucchiniMinorPayloadVersion)};
   diff_utils::BestDiffGenerator best_diff_generator(
       src_data_blob,
       dst_data_blob,
       old_extents,
       new_extents,
-      {},
-      {},
-      {.version = PayloadVersion(kBrilloMajorPayloadVersion,
-                                 kZucchiniMinorPayloadVersion)});
+      empty,
+      empty,
+      config);
   ASSERT_TRUE(best_diff_generator.GenerateBestDiffOperation(
       {{InstallOperation::ZUCCHINI, 1024 * 1024}}, &aop, &data));
 
@@ -407,15 +414,18 @@
   AnnotatedOperation aop;
   aop.op.set_type(InstallOperation::REPLACE_XZ);
 
+  std::vector<puffin::BitExtent> empty;
+  PayloadGenerationConfig config{
+      .version = PayloadVersion(kBrilloMajorPayloadVersion,
+                                kZucchiniMinorPayloadVersion)};
   diff_utils::BestDiffGenerator best_diff_generator(
       src_data_blob,
       dst_data_blob,
       old_extents,
       new_extents,
-      {},
-      {},
-      {.version = PayloadVersion(kBrilloMajorPayloadVersion,
-                                 kZucchiniMinorPayloadVersion)});
+      empty,
+      empty,
+      config);
   ASSERT_TRUE(best_diff_generator.GenerateBestDiffOperation(
       {{InstallOperation::ZUCCHINI, 1024 * 1024}}, &aop, &data));
 
@@ -439,15 +449,19 @@
 
   brillo::Blob data;
   AnnotatedOperation aop;
+
+  std::vector<puffin::BitExtent> empty;
+  PayloadGenerationConfig config{
+      .version = PayloadVersion(kMaxSupportedMajorPayloadVersion,
+                                kMaxSupportedMinorPayloadVersion)};
   ASSERT_TRUE(diff_utils::ReadExtentsToDiff(
       old_part_.path,
       new_part_.path,
       extents,
       extents,
-      {},  // old_deflates
-      {},  // new_deflates
-      {.version = PayloadVersion(kMaxSupportedMajorPayloadVersion,
-                                 kMaxSupportedMinorPayloadVersion)},
+      empty,  // old_deflates
+      empty,  // new_deflates
+      config,
       &data,
       &aop));
   auto& op = aop.op;