Mojo C++ bindings: fix MultiplexRouter and ChannelAssociatedGroupController.

mojo/public/cpp/bindings/lib/multiplex_router.h

Index: mojo/public/cpp/bindings/lib/multiplex_router.h
diff --git a/mojo/public/cpp/bindings/lib/multiplex_router.h b/mojo/public/cpp/bindings/lib/multiplex_router.h
index ac10f931d4d12c477db8fc5ec90f6430a7017780..3d7806c9ed781a2f3b1dbaa8dbc3f10edfa29773 100644
--- a/mojo/public/cpp/bindings/lib/multiplex_router.h
+++ b/mojo/public/cpp/bindings/lib/multiplex_router.h
@@ -154,7 +154,7 @@ class MOJO_CPP_BINDINGS_EXPORT MultiplexRouter
 
  private:
   class InterfaceEndpoint;
-  class IncomingMessageWrapper;
+  class MessageWrapper;
   struct Task;
 
   ~MultiplexRouter() override;
@@ -209,7 +209,7 @@ class MOJO_CPP_BINDINGS_EXPORT MultiplexRouter
       ClientCallBehavior client_call_behavior,
       base::SingleThreadTaskRunner* current_task_runner);
   bool ProcessIncomingMessage(
-      IncomingMessageWrapper* message_wrapper,
+      Message* message,
       ClientCallBehavior client_call_behavior,
       base::SingleThreadTaskRunner* current_task_runner);
 
@@ -226,6 +226,7 @@ class MOJO_CPP_BINDINGS_EXPORT MultiplexRouter
   void RaiseErrorInNonTestingMode();
 
   InterfaceEndpoint* FindOrInsertEndpoint(InterfaceId id, bool* inserted);
+  InterfaceEndpoint* FindEndpoint(InterfaceId id);
 
   void AssertLockAcquired();