Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

mojo/public/cpp/bindings/associated_group.h

Index: mojo/public/cpp/bindings/associated_group.h
diff --git a/mojo/public/cpp/bindings/associated_group.h b/mojo/public/cpp/bindings/associated_group.h
index 5f7a39632a487ec9515221b8a8e4f2dcbf1a7151..836c0d61b575bb50832ba2cfef5b210e8e19acbf 100644
--- a/mojo/public/cpp/bindings/associated_group.h
+++ b/mojo/public/cpp/bindings/associated_group.h
@@ -14,9 +14,7 @@
 
 namespace mojo {
 
-namespace internal {
-class MultiplexRouter;
-}
+class AssociatedGroupController;
 
 // AssociatedGroup refers to all the interface endpoints running at one end of a
 // message pipe. It is used to create associated interfaces for that message
@@ -78,13 +76,13 @@ class AssociatedGroup {
   }
 
  private:
-  friend class internal::MultiplexRouter;
+  friend class AssociatedGroupController;
 
   void CreateEndpointHandlePair(
       ScopedInterfaceEndpointHandle* local_endpoint,
       ScopedInterfaceEndpointHandle* remote_endpoint);
 
-  scoped_refptr<internal::MultiplexRouter> router_;
+  scoped_refptr<AssociatedGroupController> controller_;
 };
 
 }  // namespace mojo