Convert OemCryptoService interface to the new Mojo

This CL applies mojo::PendingReceiver to all uses of
OemCryptoServiceRequest.

Bug: 955171
Change-Id: I8ec250d2a56f6e72d29e5d90c20d40587174c60b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2228253Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#774897}

chrome/browser/chromeos/arc/oemcrypto/arc_oemcrypto_bridge.cc

@@ -73,7 +73,7 @@ ArcOemCryptoBridge::~ArcOemCryptoBridge() {
 }
 
 void ArcOemCryptoBridge::OnBootstrapMojoConnection(
-    mojom::OemCryptoServiceRequest request,
+    mojo::PendingReceiver<mojom::OemCryptoService> receiver,
     bool result) {
   if (!result) {
     // This can currently happen due to limited device support, so do not log
@@ -84,10 +84,11 @@ void ArcOemCryptoBridge::OnBootstrapMojoConnection(
     return;
   }
   DVLOG(1) << "ArcOemCryptoBridge succeeded with Mojo bootstrapping.";
-  ConnectToDaemon(std::move(request));
+  ConnectToDaemon(std::move(receiver));
 }
 
-void ArcOemCryptoBridge::Connect(mojom::OemCryptoServiceRequest request) {
+void ArcOemCryptoBridge::Connect(
+    mojo::PendingReceiver<mojom::OemCryptoService> receiver) {
   DVLOG(1) << "ArcOemCryptoBridge::Connect called";
 
   // Check that the user has Attestation for Content Protection enabled in
@@ -109,7 +110,7 @@ void ArcOemCryptoBridge::Connect(mojom::OemCryptoServiceRequest request) {
 
   if (oemcrypto_host_daemon_remote_.is_bound()) {
     DVLOG(1) << "Re-using bootstrap connection for OemCryptoService Connect";
-    ConnectToDaemon(std::move(request));
+    ConnectToDaemon(std::move(receiver));
     return;
   }
   DVLOG(1) << "Bootstrapping the OemCrypto connection via D-Bus";
@@ -139,11 +140,11 @@ void ArcOemCryptoBridge::Connect(mojom::OemCryptoServiceRequest request) {
       ->BootstrapMojoConnection(
           std::move(fd),
           base::BindOnce(&ArcOemCryptoBridge::OnBootstrapMojoConnection,
-                         weak_factory_.GetWeakPtr(), std::move(request)));
+                         weak_factory_.GetWeakPtr(), std::move(receiver)));
 }
 
 void ArcOemCryptoBridge::ConnectToDaemon(
-    mojom::OemCryptoServiceRequest request) {
+    mojo::PendingReceiver<mojom::OemCryptoService> receiver) {
   if (!oemcrypto_host_daemon_remote_) {
     VLOG(1) << "Mojo connection is already lost.";
     return;
@@ -155,18 +156,18 @@ void ArcOemCryptoBridge::ConnectToDaemon(
       content::GetIOThreadTaskRunner({}).get(), FROM_HERE,
       base::BindOnce(&GetGpuBufferManagerOnIOThread),
       base::BindOnce(&ArcOemCryptoBridge::FinishConnectingToDaemon,
-                     weak_factory_.GetWeakPtr(), std::move(request)));
+                     weak_factory_.GetWeakPtr(), std::move(receiver)));
 }
 
 void ArcOemCryptoBridge::FinishConnectingToDaemon(
-    mojom::OemCryptoServiceRequest request,
+    mojo::PendingReceiver<mojom::OemCryptoService> receiver,
     mojo::PendingRemote<mojom::ProtectedBufferManager> gpu_buffer_manager) {
   if (!oemcrypto_host_daemon_remote_) {
     VLOG(1) << "Mojo connection is already lost.";
     return;
   }
 
-  oemcrypto_host_daemon_remote_->Connect(std::move(request),
+  oemcrypto_host_daemon_remote_->Connect(std::move(receiver),
                                          std::move(gpu_buffer_manager));
 }
 

chrome/browser/chromeos/arc/oemcrypto/arc_oemcrypto_bridge.h

@@ -13,6 +13,7 @@
 #include "components/arc/mojom/oemcrypto.mojom.h"
 #include "components/arc/mojom/oemcrypto_daemon.mojom.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
@@ -37,14 +38,16 @@ class ArcOemCryptoBridge : public KeyedService,
   ~ArcOemCryptoBridge() override;
 
   // OemCrypto Mojo host interface
-  void Connect(mojom::OemCryptoServiceRequest request) override;
+  void Connect(
+      mojo::PendingReceiver<mojom::OemCryptoService> receiver) override;
 
  private:
-  void OnBootstrapMojoConnection(mojom::OemCryptoServiceRequest request,
+  void OnBootstrapMojoConnection(
+      mojo::PendingReceiver<mojom::OemCryptoService> receiver,
       bool result);
-  void ConnectToDaemon(mojom::OemCryptoServiceRequest request);
+  void ConnectToDaemon(mojo::PendingReceiver<mojom::OemCryptoService> receiver);
   void FinishConnectingToDaemon(
-      mojom::OemCryptoServiceRequest request,
+      mojo::PendingReceiver<mojom::OemCryptoService> receiver,
       mojo::PendingRemote<mojom::ProtectedBufferManager> gpu_buffer_manager);
   void OnMojoConnectionError();
 

components/arc/mojom/oemcrypto.mojom

@@ -342,7 +342,7 @@ interface OemCryptoService {
 // that runs in Chrome OS.
 // Next Method ID: 1
 interface OemCryptoHost {
-  Connect@0(OemCryptoService& oemcryptor);
+  Connect@0(pending_receiver<OemCryptoService> oemcryptor);
 };
 
 // OemCryptoInstance is implemented in the liboemcrypto.so library that runs in