Revert "Start setting StartVmRequest.vm"

This reverts commit 6d67f881.

Reason for revert: Fails https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel

Original change's description:
> Start setting StartVmRequest.vm
> 
> This is currently ignored by concierge when starting termina, but
> since termina can now be installed in multiple different locations we
> need concierge to start taking the value that chrome sets.
> 
> Bug: 953544
> Change-Id: I51b1ea50a5ae056d6af6baa0743a3cb0c8f8f5e5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329126
> Commit-Queue: Fergus Dall <sidereal@google.com>
> Reviewed-by: Nicholas Verne <nverne@chromium.org>
> Reviewed-by: David Munro <davidmunro@google.com>
> Cr-Commit-Position: refs/heads/master@{#795346}

TBR=nverne@chromium.org,sidereal@google.com,davidmunro@google.com

Change-Id: I6635ec58a213c3f62a855a4487bc3cb96c9e4821
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 953544
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340942Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795367}

chrome/browser/chromeos/crostini/crostini_manager.cc

@@ -1200,11 +1200,6 @@ void CrostiniManager::StartTerminaVm(std::string name,
   }
 
   vm_tools::concierge::StartVmRequest request;
-  base::FilePath base_path = termina_installer_.GetInstallLocation();
-  request.mutable_vm()->set_kernel(
-      base_path.Append(kCrostiniKernel).AsUTF8Unsafe());
-  request.mutable_vm()->set_rootfs(
-      base_path.Append(kCrostiniRootfs).AsUTF8Unsafe());
   request.set_name(std::move(name));
   request.set_start_termina(true);
   request.set_owner_id(owner_id_);
@@ -1219,24 +1214,11 @@ void CrostiniManager::StartTerminaVm(std::string name,
   DCHECK_LT(0, cpus);
   request.set_cpus(cpus);
 
-  // The stateful disk must be added first because concierge treats it
-  // specially.
-  {
-    vm_tools::concierge::DiskImage* disk_image = request.add_disks();
-    disk_image->set_path(std::move(disk_path_string));
-    disk_image->set_image_type(vm_tools::concierge::DISK_IMAGE_AUTO);
-    disk_image->set_writable(true);
-    disk_image->set_do_mount(false);
-  }
-
-  {
-    vm_tools::concierge::DiskImage* disk_image = request.add_disks();
-    disk_image->set_path(base_path.Append(kCrostiniToolfs).AsUTF8Unsafe());
-    disk_image->set_mount_point(kCrostiniToolfsMountPath);
-    disk_image->set_fstype(kCrostiniToolfsType);
-    disk_image->set_writable(false);
-    disk_image->set_do_mount(true);
-  }
+  vm_tools::concierge::DiskImage* disk_image = request.add_disks();
+  disk_image->set_path(std::move(disk_path_string));
+  disk_image->set_image_type(vm_tools::concierge::DISK_IMAGE_AUTO);
+  disk_image->set_writable(true);
+  disk_image->set_do_mount(false);
 
   GetConciergeClient()->StartTerminaVm(
       request, base::BindOnce(&CrostiniManager::OnStartTerminaVm,

chrome/browser/chromeos/crostini/crostini_manager_unittest.cc

@@ -161,15 +161,6 @@ class CrostiniManagerTest : public testing::Test {
     std::move(closure).Run();
   }
 
-  void EnsureTerminaInstalled() {
-    base::RunLoop run_loop;
-    crostini_manager()->InstallTermina(
-        base::BindOnce([](base::OnceClosure callback,
-                          CrostiniResult) { std::move(callback).Run(); },
-                       run_loop.QuitClosure()));
-    run_loop.Run();
-  }
-
   CrostiniManagerTest()
       : task_environment_(content::BrowserTaskEnvironment::REAL_IO_THREAD),
         local_state_(std::make_unique<ScopedTestingLocalState>(
@@ -442,7 +433,6 @@ TEST_F(CrostiniManagerTest, StartTerminaVmMountError) {
   response.set_mount_result(vm_tools::concierge::StartVmResponse::FAILURE);
   fake_concierge_client_->set_start_vm_response(response);
 
-  EnsureTerminaInstalled();
   crostini_manager()->StartTerminaVm(
       kVmName, disk_path, 0,
       base::BindOnce(&ExpectFailure, run_loop()->QuitClosure()));
@@ -462,7 +452,6 @@ TEST_F(CrostiniManagerTest, StartTerminaVmMountErrorThenSuccess) {
       vm_tools::concierge::StartVmResponse::PARTIAL_DATA_LOSS);
   fake_concierge_client_->set_start_vm_response(response);
 
-  EnsureTerminaInstalled();
   crostini_manager()->StartTerminaVm(
       kVmName, disk_path, 0,
       base::BindOnce(&ExpectSuccess, run_loop()->QuitClosure()));
@@ -476,7 +465,6 @@ TEST_F(CrostiniManagerTest, StartTerminaVmSuccess) {
   base::HistogramTester histogram_tester{};
   const base::FilePath& disk_path = base::FilePath(kVmName);
 
-  EnsureTerminaInstalled();
   crostini_manager()->StartTerminaVm(
       kVmName, disk_path, 0,
       base::BindOnce(&ExpectSuccess, run_loop()->QuitClosure()));
@@ -490,7 +478,6 @@ TEST_F(CrostiniManagerTest, OnStartTremplinRecordsRunningVm) {
   const std::string owner_id = CryptohomeIdForProfile(profile());
 
   // Start the Vm.
-  EnsureTerminaInstalled();
   crostini_manager()->StartTerminaVm(
       kVmName, disk_path, 0,
       base::BindOnce(&ExpectSuccess, run_loop()->QuitClosure()));

chrome/browser/chromeos/crostini/crostini_util.cc

@@ -68,12 +68,6 @@ const char kCrostiniStretchImageAlias[] = "debian/stretch";
 const char kCrostiniBusterImageAlias[] = "debian/buster";
 const char kCrostiniDlcName[] = "termina-dlc";
 
-const char kCrostiniKernel[] = "vm_kernel";
-const char kCrostiniRootfs[] = "vm_rootfs.img";
-const char kCrostiniToolfs[] = "vm_tools.img";
-const char kCrostiniToolfsMountPath[] = "/opt/google/cros-containers";
-const char kCrostiniToolfsType[] = "ext4";
-
 const base::FilePath::CharType kHomeDirectory[] = FILE_PATH_LITERAL("/home");
 
 namespace {

chrome/browser/chromeos/crostini/crostini_util.h

@@ -48,12 +48,6 @@ extern const char kCrostiniStretchImageAlias[];
 extern const char kCrostiniBusterImageAlias[];
 extern const char kCrostiniDlcName[];
 
-extern const char kCrostiniKernel[];
-extern const char kCrostiniRootfs[];
-extern const char kCrostiniToolfs[];
-extern const char kCrostiniToolfsMountPath[];
-extern const char kCrostiniToolfsType[];
-
 extern const base::FilePath::CharType kHomeDirectory[];
 
 struct LinuxPackageInfo;