Mojo C++ bindings: fix MultiplexRouter and ChannelAssociatedGroupController.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MULTIPLEX_ROUTER_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_MULTIPLEX_ROUTER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 136 matching lines @@
     DCHECK(thread_checker_.CalledOnValidThread());
     return connector_.handle();
   }
 
   bool SimulateReceivingMessageForTesting(Message* message) {
     return filters_.Accept(message);
   }
 
  private:
   class InterfaceEndpoint;
-  class IncomingMessageWrapper;
+  class MessageWrapper;
   struct Task;
 
   ~MultiplexRouter() override;
 
   // MessageReceiver implementation:
   bool Accept(Message* message) override;
 
   // PipeControlMessageHandlerDelegate implementation:
   bool OnPeerAssociatedEndpointClosed(
       InterfaceId id,
@@ skipping 34 matching lines @@
   // This method is only used by enpoints during sync watching. Therefore, not
   // all sync messages are handled by it.
   bool ProcessFirstSyncMessageForEndpoint(InterfaceId id);
 
   // Returns true to indicate that |task|/|message| has been processed.
   bool ProcessNotifyErrorTask(
       Task* task,
       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);
 
   void MaybePostToProcessTasks(base::SingleThreadTaskRunner* task_runner);
   void LockAndCallProcessTasks();
 
   // Updates the state of |endpoint|. If both the endpoint and its peer have
   // been closed, removes it from |endpoints_|.
   // NOTE: The method may invalidate |endpoint|.
   enum EndpointStateUpdateType { ENDPOINT_CLOSED, PEER_ENDPOINT_CLOSED };
   void UpdateEndpointStateMayRemove(InterfaceEndpoint* endpoint,
                                     EndpointStateUpdateType type);
 
   void RaiseErrorInNonTestingMode();
 
   InterfaceEndpoint* FindOrInsertEndpoint(InterfaceId id, bool* inserted);
+  InterfaceEndpoint* FindEndpoint(InterfaceId id);
 
   void AssertLockAcquired();
 
   // Whether to set the namespace bit when generating interface IDs. Please see
   // comments of kInterfaceIdNamespaceMask.
   const bool set_interface_id_namespace_bit_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // Owned by |filters_| below.
@@ skipping 28 matching lines @@
 
   bool testing_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiplexRouter);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MULTIPLEX_ROUTER_H_