Add SetVmId() call to ConciergeClient

This change adds support for SetVmId() call to ConciergeClient, which is
used by ArcVmClientAdapter to set the correct owner id for a mini-ARCVM
instance.

BUG=b:144542975
TEST=Use function from ArcVmClientAdapter, and check that vm_concierge
 receives the call and responds successfully.

Cq-Depend: chromium:2354353
Change-Id: I098b3fa2c1e829b693906a234aae635fa0b3ae80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354493Reviewed-by: Yusuke Sato <yusukes@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Willie Koomson <wvk@google.com>
Cr-Commit-Position: refs/heads/master@{#812448}

chromeos/dbus/concierge_client.cc

@@ -233,6 +233,12 @@ class ConciergeClientImpl : public ConciergeClient {
     CallMethod(concierge::kResizeDiskImageMethod, request, std::move(callback));
   }
 
+  void SetVmId(const vm_tools::concierge::SetVmIdRequest& request,
+               DBusMethodCallback<vm_tools::concierge::SetVmIdResponse>
+                   callback) override {
+    CallMethod(concierge::kSetVmIdMethod, request, std::move(callback));
+  }
+
  protected:
   void Init(dbus::Bus* bus) override {
     concierge_proxy_ = bus->GetObjectProxy(

chromeos/dbus/concierge_client.h

@@ -249,6 +249,12 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) ConciergeClient : public DBusClient {
       DBusMethodCallback<vm_tools::concierge::ResizeDiskImageResponse>
           callback) = 0;
 
+  // Sets the cryptohome id of the given VM.
+  // |callback| is called after the method call finishes.
+  virtual void SetVmId(
+      const vm_tools::concierge::SetVmIdRequest& request,
+      DBusMethodCallback<vm_tools::concierge::SetVmIdResponse> callback) = 0;
+
   // Creates an instance of ConciergeClient.
   static std::unique_ptr<ConciergeClient> Create();
 

chromeos/dbus/fake_concierge_client.cc

@@ -309,6 +309,14 @@ void FakeConciergeClient::ResizeDiskImage(
                                 weak_ptr_factory_.GetWeakPtr()));
 }
 
+void FakeConciergeClient::SetVmId(
+    const vm_tools::concierge::SetVmIdRequest& request,
+    DBusMethodCallback<vm_tools::concierge::SetVmIdResponse> callback) {
+  set_vm_id_called_ = true;
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(std::move(callback), set_vm_id_response_));
+}
+
 void FakeConciergeClient::NotifyVmStarted(
     const vm_tools::concierge::VmStartedSignal& signal) {
   for (auto& observer : vm_observer_list_)
@@ -374,6 +382,9 @@ void FakeConciergeClient::InitializeProtoResponses() {
 
   detach_usb_device_response_.emplace();
   detach_usb_device_response_->set_success(true);
+
+  set_vm_id_response_.emplace();
+  set_vm_id_response_->set_success(true);
 }
 
 }  // namespace chromeos

chromeos/dbus/fake_concierge_client.h

@@ -116,6 +116,10 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeConciergeClient
       DBusMethodCallback<vm_tools::concierge::ResizeDiskImageResponse> callback)
       override;
 
+  void SetVmId(const vm_tools::concierge::SetVmIdRequest& request,
+               DBusMethodCallback<vm_tools::concierge::SetVmIdResponse>
+                   callback) override;
+
   const base::ObserverList<Observer>& observer_list() const {
     return observer_list_;
   }
@@ -286,6 +290,7 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeConciergeClient
   bool detach_usb_device_called_ = false;
   bool start_arc_vm_called_ = false;
   bool resize_disk_image_called_ = false;
+  bool set_vm_id_called_ = false;
   bool is_vm_started_signal_connected_ = true;
   bool is_vm_stopped_signal_connected_ = true;
   bool is_container_startup_failed_signal_connected_ = true;
@@ -321,6 +326,7 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeConciergeClient
       detach_usb_device_response_;
   base::Optional<vm_tools::concierge::ResizeDiskImageResponse>
       resize_disk_image_response_;
+  base::Optional<vm_tools::concierge::SetVmIdResponse> set_vm_id_response_;
 
   // Can be set to fake a series of disk image status signals.
   std::vector<vm_tools::concierge::DiskImageStatusResponse>