crostini: Use ContainerId in LinuxPackageOperationProgressObserver interface

Change-Id: I81cd0f7ac56d381662a9c644bcbe9699f54b9e4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1840271
Auto-Submit: Julian Watson <juwa@google.com>
Commit-Queue: Nicholas Verne <nverne@chromium.org>
Reviewed-by: Nicholas Verne <nverne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703650}

chrome/browser/chromeos/crostini/ansible/ansible_management_service.cc

@@ -99,12 +99,11 @@ void AnsibleManagementService::OnInstallAnsibleInDefaultContainer(
 }
 
 void AnsibleManagementService::OnInstallLinuxPackageProgress(
-    const std::string& vm_name,
-    const std::string& container_name,
+    const ContainerId& container_id,
     InstallLinuxPackageProgressStatus status,
     int progress_percent) {
-  DCHECK_EQ(vm_name, kCrostiniDefaultVmName);
-  DCHECK_EQ(container_name, kCrostiniDefaultContainerName);
+  DCHECK_EQ(container_id.first, kCrostiniDefaultVmName);
+  DCHECK_EQ(container_id.second, kCrostiniDefaultContainerName);
 
   switch (status) {
     case InstallLinuxPackageProgressStatus::SUCCEEDED:
@@ -129,8 +128,7 @@ void AnsibleManagementService::OnInstallLinuxPackageProgress(
 }
 
 void AnsibleManagementService::OnUninstallPackageProgress(
-    const std::string& vm_name,
-    const std::string& container_name,
+    const ContainerId& container_id,
     UninstallPackageProgressStatus status,
     int progress_percent) {
   NOTIMPLEMENTED();

chrome/browser/chromeos/crostini/ansible/ansible_management_service.h

@@ -48,12 +48,10 @@ class AnsibleManagementService : public KeyedService,
       base::OnceCallback<void(bool success)> callback);
 
   // LinuxPackageOperationProgressObserver:
-  void OnInstallLinuxPackageProgress(const std::string& vm_name,
-                                     const std::string& container_name,
+  void OnInstallLinuxPackageProgress(const ContainerId& container_id,
                                      InstallLinuxPackageProgressStatus status,
                                      int progress_percent) override;
-  void OnUninstallPackageProgress(const std::string& vm_name,
-                                  const std::string& container_name,
+  void OnUninstallPackageProgress(const ContainerId& container_id,
                                   UninstallPackageProgressStatus status,
                                   int progress_percent) override;
 

chrome/browser/chromeos/crostini/crostini_manager.cc

@@ -2069,9 +2069,9 @@ void CrostiniManager::OnInstallLinuxPackageProgress(
       NOTREACHED();
   }
 
+  ContainerId container_id(signal.vm_name(), signal.container_name());
   for (auto& observer : linux_package_operation_progress_observers_) {
-    observer.OnInstallLinuxPackageProgress(signal.vm_name(),
-                                           signal.container_name(), status,
+    observer.OnInstallLinuxPackageProgress(container_id, status,
                                            signal.progress_percent());
   }
 }
@@ -2103,9 +2103,9 @@ void CrostiniManager::OnUninstallPackageProgress(
       NOTREACHED();
   }
 
+  ContainerId container_id(signal.vm_name(), signal.container_name());
   for (auto& observer : linux_package_operation_progress_observers_) {
-    observer.OnUninstallPackageProgress(signal.vm_name(),
-                                        signal.container_name(), status,
+    observer.OnUninstallPackageProgress(container_id, status,
                                         signal.progress_percent());
   }
 }

chrome/browser/chromeos/crostini/crostini_manager.h

@@ -39,15 +39,13 @@ class LinuxPackageOperationProgressObserver {
   // |progress_percent| field is given as a percentage of the given step,
   // DOWNLOADING or INSTALLING.
   virtual void OnInstallLinuxPackageProgress(
-      const std::string& vm_name,
-      const std::string& container_name,
+      const ContainerId& container_id,
       InstallLinuxPackageProgressStatus status,
       int progress_percent) = 0;
 
   // A successfully started package uninstall will continually fire progress
   // events until it returns a status of SUCCEEDED or FAILED.
-  virtual void OnUninstallPackageProgress(const std::string& vm_name,
-                                          const std::string& container_name,
+  virtual void OnUninstallPackageProgress(const ContainerId& container_id,
                                           UninstallPackageProgressStatus status,
                                           int progress_percent) = 0;
 };

chrome/browser/chromeos/crostini/crostini_package_service.cc

@@ -249,8 +249,7 @@ void CrostiniPackageService::QueueInstallLinuxPackage(
 }
 
 void CrostiniPackageService::OnInstallLinuxPackageProgress(
-    const std::string& vm_name,
-    const std::string& container_name,
+    const ContainerId& container_id,
     InstallLinuxPackageProgressStatus status,
     int progress_percent) {
   // Linux package install has two phases, downloading and installing, which we
@@ -260,19 +259,16 @@ void CrostiniPackageService::OnInstallLinuxPackageProgress(
   if (status == InstallLinuxPackageProgressStatus::INSTALLING)
     display_progress += 50;  // Second phase
 
-  UpdatePackageOperationStatus(ContainerId(vm_name, container_name),
-                               InstallStatusToOperationStatus(status),
-                               display_progress);
+  UpdatePackageOperationStatus(
+      container_id, InstallStatusToOperationStatus(status), display_progress);
 }
 
 void CrostiniPackageService::OnUninstallPackageProgress(
-    const std::string& vm_name,
-    const std::string& container_name,
+    const ContainerId& container_id,
     UninstallPackageProgressStatus status,
     int progress_percent) {
-  UpdatePackageOperationStatus(ContainerId(vm_name, container_name),
-                               UninstallStatusToOperationStatus(status),
-                               progress_percent);
+  UpdatePackageOperationStatus(
+      container_id, UninstallStatusToOperationStatus(status), progress_percent);
 }
 
 void CrostiniPackageService::OnVmShutdown(const std::string& vm_name) {

chrome/browser/chromeos/crostini/crostini_package_service.h

@@ -58,13 +58,11 @@ class CrostiniPackageService : public KeyedService,
       CrostiniManager::GetLinuxPackageInfoCallback callback);
 
   // LinuxPackageOperationProgressObserver:
-  void OnInstallLinuxPackageProgress(const std::string& vm_name,
-                                     const std::string& container_name,
+  void OnInstallLinuxPackageProgress(const ContainerId& container_id,
                                      InstallLinuxPackageProgressStatus status,
                                      int progress_percent) override;
 
-  void OnUninstallPackageProgress(const std::string& vm_name,
-                                  const std::string& container_name,
+  void OnUninstallPackageProgress(const ContainerId& container_id,
                                   UninstallPackageProgressStatus status,
                                   int progress_percent) override;