Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

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

Index: mojo/public/cpp/bindings/lib/serialization_util.h
diff --git a/mojo/public/cpp/bindings/lib/serialization_util.h b/mojo/public/cpp/bindings/lib/serialization_util.h
index a93781753c9582c0230f742a7578b9f49293ab1d..523f4842c366c46e4b5c3b79527a2a891ef579b8 100644
--- a/mojo/public/cpp/bindings/lib/serialization_util.h
+++ b/mojo/public/cpp/bindings/lib/serialization_util.h
@@ -19,9 +19,10 @@
 #include "mojo/public/cpp/system/handle.h"
 
 namespace mojo {
-namespace internal {
 
-class MultiplexRouter;
+class AssociatedGroupController;
+
+namespace internal {
 
 size_t Align(size_t size);
 char* AlignPointer(char* ptr);
@@ -76,9 +77,9 @@ template <typename T>
 inline void AssociatedInterfaceDataToPtrInfo(
     AssociatedInterface_Data* input,
     AssociatedInterfacePtrInfo<T>* output,
-    MultiplexRouter* router) {
-  output->set_handle(
-      router->CreateLocalEndpointHandle(FetchAndReset(&input->interface_id)));
+    AssociatedGroupController* group_controller) {
+  output->set_handle(group_controller->CreateLocalEndpointHandle(
+      FetchAndReset(&input->interface_id)));
   output->set_version(input->version);
 }