Fix Upgrade flow bugs

Backends assume the container (not just the vm) is running, so remove the
partial-startup logic.
Using emplace() on a map never updates existing entries. Now fixed.

Bug: 1024693
Change-Id: I58a47de30fe9c258023472b1cea80abbbbb81461
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2065511
Commit-Queue: Nic Hollingum <hollingum@google.com>
Auto-Submit: Nicholas Verne <nverne@chromium.org>
Reviewed-by: Nic Hollingum <hollingum@google.com>
Cr-Commit-Position: refs/heads/master@{#742971}

chrome/browser/chromeos/crostini/crostini_manager.cc

@@ -703,7 +703,7 @@ void CrostiniManager::SetContainerOsRelease(
   VLOG(1) << "os_release.version " << os_release.version();
   VLOG(1) << "os_release.version_id " << os_release.version_id();
   VLOG(1) << "os_release.id " << os_release.id();
-  container_os_releases_.emplace(std::move(container_id), os_release);
+  container_os_releases_[container_id] = os_release;
 
   base::UmaHistogramEnumeration("Crostini.ContainerOsVersion", version);
 }
@@ -1619,8 +1619,7 @@ void CrostiniManager::UpgradeContainer(const ContainerId& key,
       weak_ptr_factory_.GetWeakPtr(), std::move(request), std::move(callback));
 
   if (!IsVmRunning(vm_name)) {
-    RestartCrostini(vm_name, container_name, std::move(do_upgrade_container),
-                    new AbortOnVmStartObserver(weak_ptr_factory_.GetWeakPtr()));
+    RestartCrostini(vm_name, container_name, std::move(do_upgrade_container));
   } else {
     std::move(do_upgrade_container).Run(CrostiniResult::SUCCESS);
   }