Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

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>
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/ref_counted_delete_on_message_loop.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
+#include "mojo/public/cpp/bindings/associated_group_controller.h"
+#include "mojo/public/cpp/bindings/interface_id.h"
 #include "mojo/public/cpp/bindings/lib/connector.h"
-#include "mojo/public/cpp/bindings/lib/interface_id.h"
 #include "mojo/public/cpp/bindings/lib/message_header_validator.h"
 #include "mojo/public/cpp/bindings/lib/pipe_control_message_handler.h"
 #include "mojo/public/cpp/bindings/lib/pipe_control_message_handler_delegate.h"
 #include "mojo/public/cpp/bindings/lib/pipe_control_message_proxy.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace mojo {
 
 class AssociatedGroup;
 
 namespace internal {
 
-class InterfaceEndpointClient;
-class InterfaceEndpointController;
-
 // 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.
 class MultiplexRouter
     : public MessageReceiver,
-      public base::RefCountedDeleteOnMessageLoop<MultiplexRouter>,
+      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);
 
   // Sets the master interface name for this router. Only used when reporting
   // message header or control message validation errors.
   void SetMasterInterfaceName(const std::string& name);
 
   // ---------------------------------------------------------------------------
   // The following public methods are safe to call from any threads.
 
-  // Creates a pair of interface endpoint handles. The method generates a new
-  // interface ID and assigns it to the two handles. |local_endpoint| is used
-  // locally; while |remote_endpoint| is sent over the message pipe.
-  void CreateEndpointHandlePair(ScopedInterfaceEndpointHandle* local_endpoint,
-                                ScopedInterfaceEndpointHandle* remote_endpoint);
-
-  // Creates an interface endpoint handle from a given interface ID. The handle
-  // is used locally.
-  // Typically, this method is used to (1) create an endpoint handle for the
-  // master interface; or (2) create an endpoint handle on receiving an
-  // interface ID from the message pipe.
-  ScopedInterfaceEndpointHandle CreateLocalEndpointHandle(InterfaceId id);
-
-  // Closes an interface endpoint handle.
-  void CloseEndpointHandle(InterfaceId id, bool is_local);
-
-  // Attaches a client to the specified endpoint to send and receive messages.
-  // The returned object is still owned by the router. It must only be used on
-  // the same thread as this call, and only before the client is detached using
-  // DetachEndpointClient().
+  // AssociatedGroupController implementation:
+  void CreateEndpointHandlePair(
+      ScopedInterfaceEndpointHandle* local_endpoint,
+      ScopedInterfaceEndpointHandle* remote_endpoint) override;
+  ScopedInterfaceEndpointHandle CreateLocalEndpointHandle(
+      InterfaceId id) override;
+  void CloseEndpointHandle(InterfaceId id, bool is_local) override;
   InterfaceEndpointController* AttachEndpointClient(
       const ScopedInterfaceEndpointHandle& handle,
       InterfaceEndpointClient* endpoint_client,
-      scoped_refptr<base::SingleThreadTaskRunner> runner);
-
-  // Detaches the client attached to the specified endpoint. It must be called
-  // on the same thread as the corresponding AttachEndpointClient() call.
-  void DetachEndpointClient(const ScopedInterfaceEndpointHandle& handle);
-
-  // Raises an error on the underlying message pipe. It disconnects the pipe
-  // and notifies all interfaces running on this pipe.
-  void RaiseError();
-
-  std::unique_ptr<AssociatedGroup> CreateAssociatedGroup();
-
-  static MultiplexRouter* GetRouter(AssociatedGroup* associated_group);
+      scoped_refptr<base::SingleThreadTaskRunner> runner) override;
+  void DetachEndpointClient(
+      const ScopedInterfaceEndpointHandle& handle) override;
+  void RaiseError() override;
 
   // ---------------------------------------------------------------------------
   // The following public methods are called on the creating thread.
 
   // Please note that this method shouldn't be called unless it results from an
   // explicit request of the user of bindings (e.g., the user sets an
   // InterfacePtr to null or closes a Binding).
   void CloseMessagePipe();
 
   // Extracts the underlying message pipe.
@@ skipping 33 matching lines @@
     return connector_.is_valid();
   }
 
   // TODO(yzshen): consider removing this getter.
   MessagePipeHandle handle() const {
     DCHECK(thread_checker_.CalledOnValidThread());
     return connector_.handle();
   }
 
  private:
   friend class base::RefCountedDeleteOnMessageLoop<MultiplexRouter>;

[yzshen1, 2016/06/30 15:34:42]

Is this one still necessary?

[Ken Rockot(use gerrit already), 2016/06/30 15:57:39]

Nope, removed

-  friend class base::DeleteHelper<MultiplexRouter>;
 
   class InterfaceEndpoint;
   struct Task;
 
   ~MultiplexRouter() override;
 
   // MessageReceiver implementation:
   bool Accept(Message* message) override;
 
   // PipeControlMessageHandlerDelegate implementation:
@@ skipping 87 matching lines @@
 
   bool testing_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiplexRouter);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MULTIPLEX_ROUTER_H_