BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 0 insertions, 38 deletions

diff --git a/chromium/ipc/ipc_channel.h b/chromium/ipc/ipc_channel.h
index 5c3ad99b1cb..f3bf7f6ca59 100644
--- a/chromium/ipc/ipc_channel.h
+++ b/chromium/ipc/ipc_channel.h
@@ -24,8 +24,6 @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
-#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
-#include "mojo/public/cpp/bindings/associated_interface_request.h"
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h"
@@ -110,21 +108,6 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
         const std::string& name,
         mojo::ScopedInterfaceEndpointHandle handle) = 0;
 
-    // Remove this after done with migrating all AsscoiatedInterfacePtr to
-    // AsscoiatedRemote.
-    // Template helper to add an interface factory to this channel.
-    template <typename Interface>
-    using AssociatedInterfaceFactory = base::RepeatingCallback<void(
-        mojo::AssociatedInterfaceRequest<Interface>)>;
-    template <typename Interface>
-    void AddAssociatedInterface(
-        const AssociatedInterfaceFactory<Interface>& factory) {
-      AddGenericAssociatedInterface(
-          Interface::Name_,
-          base::BindRepeating(&BindAssociatedInterfaceRequest<Interface>,
-                              factory));
-    }
-
     // Template helper to add an interface factory to this channel.
     template <typename Interface>
     using AssociatedReceiverFactory = base::RepeatingCallback<void(
@@ -138,17 +121,6 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
                               factory));
     }
 
-    // Remove this after done with migrating all AsscoiatedInterfacePtr to
-    // AsscoiatedRemote.
-    // Template helper to request a remote associated interface.
-    template <typename Interface>
-    void GetRemoteAssociatedInterface(
-        mojo::AssociatedInterfacePtr<Interface>* proxy) {
-      auto request = mojo::MakeRequest(proxy);
-      GetGenericRemoteAssociatedInterface(Interface::Name_,
-                                          request.PassHandle());
-    }
-
     // Template helper to request a remote associated interface.
     template <typename Interface>
     void GetRemoteAssociatedInterface(
@@ -158,16 +130,6 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
     }
 
    private:
-    // Remove this after done with migrating all AsscoiatedInterfacePtr to
-    // AsscoiatedRemote.
-    template <typename Interface>
-    static void BindAssociatedInterfaceRequest(
-        const AssociatedInterfaceFactory<Interface>& factory,
-        mojo::ScopedInterfaceEndpointHandle handle) {
-      factory.Run(
-          mojo::AssociatedInterfaceRequest<Interface>(std::move(handle)));
-    }
-
     template <typename Interface>
     static void BindPendingAssociatedReceiver(
         const AssociatedReceiverFactory<Interface>& factory,