commit 6b0a9849373e6d2eafca7b5c3dc24ac527f5fd7c
author Yifan Hong <elsk@google.com> Tue Oct 16 16:54:18 2018 -0700
committer Yifan Hong <elsk@google.com> Fri Oct 26 18:23:52 2018 +0000
tree a07e268df193f341e3bd40ce4f76e8fd0ac77c47
parent a91195d0da8751af5d434d6465ff33f2712aca2c

PartitionSizes -> PartitionMetadata

In a following CL, InitPartiitonMetadata not only
takes sizes but also group of each partition. Rename
the struct to a more generic name.

Test: builds
Change-Id: Ie8a7e58b0cccc45e533de368e24f5a73d556de65

boot_control_android.cc

diff --git a/boot_control_android.cc b/boot_control_android.cc
index ad819ad..622646e 100644
--- a/boot_control_android.cc
+++ b/boot_control_android.cc
@@ -40,8 +40,8 @@
 using android::hardware::boot::V1_0::CommandResult;
 using android::hardware::boot::V1_0::IBootControl;
 using Slot = chromeos_update_engine::BootControlInterface::Slot;
-using PartitionSizes =
-    chromeos_update_engine::BootControlInterface::PartitionSizes;
+using PartitionMetadata =
+    chromeos_update_engine::BootControlInterface::PartitionMetadata;
 
 namespace {
 
@@ -260,7 +260,7 @@
                       const string& super_device,
                       Slot target_slot,
                       const string& target_suffix,
-                      const PartitionSizes& logical_sizes,
+                      const PartitionMetadata& logical_sizes,
                       MetadataBuilder* builder) {
   // Delete all extents to ensure that each partition has enough space to
   // grow.
@@ -317,12 +317,12 @@
 
 bool FilterPartitionSizes(DynamicPartitionControlInterface* dynamic_control,
                           const base::FilePath& device_dir,
-                          const PartitionSizes& partition_sizes,
+                          const PartitionMetadata& partition_metadata,
                           MetadataBuilder* source_metadata,
                           const string& source_suffix,
                           const string& target_suffix,
-                          PartitionSizes* logical_sizes) {
-  for (const auto& pair : partition_sizes) {
+                          PartitionMetadata* logical_sizes) {
+  for (const auto& pair : partition_metadata) {
     if (!IsDynamicPartition(dynamic_control,
                             device_dir,
                             source_metadata,
@@ -347,7 +347,7 @@
                           const string& super_device,
                           Slot target_slot,
                           const string& suffix,
-                          const PartitionSizes& logical_sizes) {
+                          const PartitionMetadata& logical_sizes) {
   auto target_metadata =
       dynamic_control->LoadMetadataBuilder(super_device, target_slot);
   if (target_metadata == nullptr) {
@@ -385,7 +385,7 @@
 }  // namespace
 
 bool BootControlAndroid::InitPartitionMetadata(
-    Slot target_slot, const PartitionSizes& partition_sizes) {
+    Slot target_slot, const PartitionMetadata& partition_metadata) {
   if (!dynamic_control_->IsDynamicPartitionsEnabled()) {
     return true;
   }
@@ -423,10 +423,10 @@
   // Read metadata from current slot to determine which partitions are logical
   // and may be resized. Do not read from target slot because metadata at
   // target slot may be corrupted.
-  PartitionSizes logical_sizes;
+  PartitionMetadata logical_sizes;
   if (!FilterPartitionSizes(dynamic_control_.get(),
                             device_dir,
-                            partition_sizes,
+                            partition_metadata,
                             builder.get() /* source metadata */,
                             current_suffix,
                             target_suffix,