Make AndroidEfiLoaderFlag inherit from FlagBase

Bug: b/472361611

Author: Databean

base/cvd/cuttlefish/host/commands/assemble_cvd/disk_image_flags_vectorization.cc

@@ -139,7 +139,7 @@ Result<void> DiskImageFlagsVectorization(
     }
     instance.set_super_image(super_image.SuperImageForIndex(instance_index));
     instance.set_android_efi_loader(
-        android_efi_loader.AndroidEfiLoaderForInstance(instance_index));
+        android_efi_loader.ForIndex(instance_index));
     if (instance_index >= chromeos_disk.size()) {
       instance.set_chromeos_disk(chromeos_disk[0]);
     } else {

base/cvd/cuttlefish/host/commands/assemble_cvd/flags/BUILD.bazel

@@ -25,6 +25,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
+        "//cuttlefish/host/commands/assemble_cvd/flags:flag_base",
         "//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
         "//cuttlefish/host/commands/assemble_cvd/flags:vm_manager",
         "//cuttlefish/host/libs/config:vmm_mode",

base/cvd/cuttlefish/host/commands/assemble_cvd/flags/android_efi_loader.cc

@@ -69,17 +69,6 @@ AndroidEfiLoaderFlag AndroidEfiLoaderFlag::FromGlobalGflags(
 }
 
 AndroidEfiLoaderFlag::AndroidEfiLoaderFlag(std::vector<std::string> paths)
-    : paths_(std::move(paths)) {}
-
-std::string AndroidEfiLoaderFlag::AndroidEfiLoaderForInstance(
-    size_t instance_index) const {
-  if (instance_index < paths_.size()) {
-    return paths_[instance_index];
-  } else if (!paths_.empty()) {
-    return paths_[0];
-  } else {
-    return "";
-  }
-}
+    : FlagBase(paths) {}
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/assemble_cvd/flags/android_efi_loader.h

@@ -20,23 +20,21 @@
 #include <string>
 #include <vector>
 
+#include "cuttlefish/host/commands/assemble_cvd/flags/flag_base.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/system_image_dir.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags/vm_manager.h"
 
 namespace cuttlefish {
 
 /* `--android_efi_loader` flag */
-class AndroidEfiLoaderFlag {
+class AndroidEfiLoaderFlag : public FlagBase<std::string> {
  public:
   static AndroidEfiLoaderFlag FromGlobalGflags(const SystemImageDirFlag&,
                                                const VmManagerFlag&);
-
-  std::string AndroidEfiLoaderForInstance(size_t instance_index) const;
+  ~AndroidEfiLoaderFlag() override = default;
 
  private:
   AndroidEfiLoaderFlag(std::vector<std::string>);
-
-  std::vector<std::string> paths_;
 };
 
 }  // namespace cuttlefish