Eliminate deferred destruction of AssociatedGroupController

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 29 matching lines @@
 
 // MultiplexRouter supports routing messages for multiple interfaces over a
 // single message pipe.
 //
 // It is created on the thread where the master interface of the message pipe
 // lives. Although it is ref-counted, it is guarateed to be destructed on the
 // same thread.
 // Some public methods are only allowed to be called on the creating thread;
 // while the others are safe to call from any threads. Please see the method
 // comments for more details.
+//
+// NOTE: CloseMessagePipe() or PassMessagePipe() MUST be called on |runner|'s
+// thread before this object is destroyed.
 class MultiplexRouter
     : public MessageReceiver,
       public AssociatedGroupController,
       public PipeControlMessageHandlerDelegate {
  public:
   // If |set_interface_id_namespace_bit| is true, the interface IDs generated by
   // this router will have the highest bit set.
   MultiplexRouter(bool set_interface_id_namespace_bit,
                   ScopedMessagePipeHandle message_pipe,
                   scoped_refptr<base::SingleThreadTaskRunner> runner);
@@ skipping 134 matching lines @@
                                     EndpointStateUpdateType type);
 
   void RaiseErrorInNonTestingMode();
 
   InterfaceEndpoint* FindOrInsertEndpoint(InterfaceId id, bool* inserted);
 
   // 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_;
+
   MessageHeaderValidator header_validator_;
   Connector connector_;
 
   base::ThreadChecker thread_checker_;
 
   // Protects the following members.
   mutable base::Lock lock_;
   PipeControlMessageHandler control_message_handler_;
   PipeControlMessageProxy control_message_proxy_;
 
@@ skipping 13 matching lines @@
 
   bool testing_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiplexRouter);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MULTIPLEX_ROUTER_H_