BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 17 insertions, 13 deletions

diff --git a/chromium/components/arc/midis/arc_midis_bridge.cc b/chromium/components/arc/midis/arc_midis_bridge.cc
index a0edd30b3a4..94f0dc74bcc 100644
--- a/chromium/components/arc/midis/arc_midis_bridge.cc
+++ b/chromium/components/arc/midis/arc_midis_bridge.cc
@@ -57,8 +57,8 @@ ArcMidisBridge::~ArcMidisBridge() {
 }
 
 void ArcMidisBridge::OnBootstrapMojoConnection(
-    mojom::MidisServerRequest request,
-    mojom::MidisClientPtr client_ptr,
+    mojo::PendingReceiver<mojom::MidisServer> receiver,
+    mojo::PendingRemote<mojom::MidisClient> client_remote,
     bool result) {
   if (!result) {
     LOG(ERROR) << "ArcMidisBridge had a failure in D-Bus with the daemon.";
@@ -70,14 +70,15 @@ void ArcMidisBridge::OnBootstrapMojoConnection(
     return;
   }
   DVLOG(1) << "ArcMidisBridge succeeded with Mojo bootstrapping.";
-  midis_host_remote_->Connect(std::move(request), std::move(client_ptr));
+  midis_host_remote_->Connect(std::move(receiver), std::move(client_remote));
 }
 
-void ArcMidisBridge::Connect(mojom::MidisServerRequest request,
-                             mojom::MidisClientPtr client_ptr) {
+void ArcMidisBridge::Connect(
+    mojo::PendingReceiver<mojom::MidisServer> receiver,
+    mojo::PendingRemote<mojom::MidisClient> client_remote) {
   if (midis_host_remote_.is_bound()) {
     DVLOG(1) << "Re-using bootstrap connection for MidisServer Connect.";
-    midis_host_remote_->Connect(std::move(request), std::move(client_ptr));
+    midis_host_remote_->Connect(std::move(receiver), std::move(client_remote));
     return;
   }
   DVLOG(1) << "Bootstrapping the Midis connection via D-Bus.";
@@ -101,8 +102,8 @@ void ArcMidisBridge::Connect(mojom::MidisServerRequest request,
       ->BootstrapMojoConnection(
           channel.TakeRemoteEndpoint().TakePlatformHandle().TakeFD(),
           base::BindOnce(&ArcMidisBridge::OnBootstrapMojoConnection,
-                         weak_factory_.GetWeakPtr(), std::move(request),
-                         std::move(client_ptr)));
+                         weak_factory_.GetWeakPtr(), std::move(receiver),
+                         std::move(client_remote)));
 }
 
 void ArcMidisBridge::OnMojoConnectionError() {
diff --git a/chromium/components/arc/midis/arc_midis_bridge.h b/chromium/components/arc/midis/arc_midis_bridge.h
index 6bfcf7ba1a0..3b97a95e022 100644
--- a/chromium/components/arc/midis/arc_midis_bridge.h
+++ b/chromium/components/arc/midis/arc_midis_bridge.h
@@ -12,6 +12,8 @@
 #include "base/macros.h"
 #include "components/arc/mojom/midis.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"
 
 namespace content {
@@ -34,13 +36,14 @@ class ArcMidisBridge : public KeyedService,
   ~ArcMidisBridge() override;
 
   // Midis Mojo host interface
-  void Connect(mojom::MidisServerRequest request,
-               mojom::MidisClientPtr client_ptr) override;
+  void Connect(mojo::PendingReceiver<mojom::MidisServer> receiver,
+               mojo::PendingRemote<mojom::MidisClient> client_remote) override;
 
  private:
-  void OnBootstrapMojoConnection(mojom::MidisServerRequest request,
-                                 mojom::MidisClientPtr client_ptr,
-                                 bool result);
+  void OnBootstrapMojoConnection(
+      mojo::PendingReceiver<mojom::MidisServer> receiver,
+      mojo::PendingRemote<mojom::MidisClient> client_remote,
+      bool result);
   void OnMojoConnectionError();
 
   ArcBridgeService* const arc_bridge_service_;  // Owned by ArcServiceManager.