Add GetVmInfo

Change running_vms_ to be a map rather than set and store VmInfos for
running VMs..

Bug: 878324
Change-Id: I159a0c201a9f35ba64d81b57e0687cb95f2eec6f
Reviewed-on: https://chromium-review.googlesource.com/1193386
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: Nicholas Verne <nverne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588283}

chrome/browser/chromeos/crostini/crostini_manager.cc

@@ -515,6 +515,24 @@ bool CrostiniManager::IsVmRunning(Profile* profile, std::string vm_name) {
          running_vms_.end();
 }
 
+base::Optional<vm_tools::concierge::VmInfo> CrostiniManager::GetVmInfo(
+    Profile* profile,
+    std::string vm_name) {
+  auto it = running_vms_.find(
+      std::make_pair(CryptohomeIdForProfile(profile), std::move(vm_name)));
+  if (it != running_vms_.end())
+    return it->second;
+  return base::nullopt;
+}
+
+void CrostiniManager::AddRunningVmForTesting(
+    std::string owner_id,
+    std::string vm_name,
+    vm_tools::concierge::VmInfo vm_info) {
+  auto key = std::make_pair(std::move(owner_id), std::move(vm_name));
+  running_vms_[key] = std::move(vm_info);
+}
+
 bool CrostiniManager::IsContainerRunning(Profile* profile,
                                          std::string vm_name,
                                          std::string container_name) {
@@ -1314,6 +1332,9 @@ void CrostiniManager::OnStartTerminaVm(
     tremplin_started_callbacks_.emplace(
         std::make_pair(std::move(owner_id), std::move(vm_name)),
         base::BindOnce(std::move(callback), ConciergeClientResult::SUCCESS));
+    // Record the running vm.
+    auto key = std::make_pair(std::move(owner_id), std::move(vm_name));
+    running_vms_[key] = std::move(response.vm_info());
     return;
   }
   std::move(callback).Run(ConciergeClientResult::SUCCESS);
@@ -1534,8 +1555,6 @@ void CrostiniManager::OnTremplinStarted(
     std::move(it->second).Run();
   }
   tremplin_started_callbacks_.erase(range.first, range.second);
-  // Record the running vm.
-  running_vms_.emplace(signal.owner_id(), signal.vm_name());
 }
 
 void CrostiniManager::OnLaunchContainerApplication(

chrome/browser/chromeos/crostini/crostini_manager.h

@@ -361,6 +361,12 @@ class CrostiniManager : public chromeos::ConciergeClient::Observer,
   static CrostiniManager* GetInstance();
 
   bool IsVmRunning(Profile* profile, std::string vm_name);
+  // Returns null if VM is not running.
+  base::Optional<vm_tools::concierge::VmInfo> GetVmInfo(Profile* profile,
+                                                        std::string vm_name);
+  void AddRunningVmForTesting(std::string owner_id,
+                              std::string vm_name,
+                              vm_tools::concierge::VmInfo vm_info);
   bool IsContainerRunning(Profile* profile,
                           std::string vm_name,
                           std::string container_name);
@@ -522,7 +528,8 @@ class CrostiniManager : public chromeos::ConciergeClient::Observer,
       tremplin_started_callbacks_;
 
   // Running vms as <owner_id, vm_name> pairs.
-  std::set<std::pair<std::string, std::string>> running_vms_;
+  std::map<std::pair<std::string, std::string>, vm_tools::concierge::VmInfo>
+      running_vms_;
 
   // Running containers as keyed by <owner_id, vm_name> string pairs.
   std::multimap<std::pair<std::string, std::string>, std::string>