Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

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

 // Copyright 2013 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_SERIALIZATION_UTIL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_UTIL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 #include "mojo/public/cpp/bindings/lib/serialization_context.h"
 #include "mojo/public/cpp/system/handle.h"
 
 namespace mojo {
+
+class AssociatedGroupController;
+
 namespace internal {
 
-class MultiplexRouter;
-
 size_t Align(size_t size);
 char* AlignPointer(char* ptr);
 
 bool IsAligned(const void* ptr);
 
 // Pointers are encoded as relative offsets. The offsets are relative to the
 // address of where the offset value is stored, such that the pointer may be
 // recovered with the expression:
 //
 //   ptr = reinterpret_cast<char*>(offset) + *offset
@@ skipping 33 matching lines @@
     AssociatedInterfacePtrInfo<T> input,
     AssociatedInterface_Data* output) {
   output->version = input.version();
   output->interface_id = input.PassHandle().release();
 }
 
 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);
 }
 
 template <typename T>
 inline void InterfacePointerToData(InterfacePtr<T> input,
                                    Interface_Data* output,
                                    SerializationContext* context) {
   InterfacePtrInfo<T> info = input.PassInterface();
   output->handle = context->handles.AddHandle(info.PassHandle().release());
   output->version = info.version();
@@ skipping 194 matching lines @@
     typename std::enable_if<
         !HasGetDataMethod<Traits, MaybeConstUserType>::value>::type* = nullptr>
 void* CallGetDataIfExists(MaybeConstUserType& input) {
   return nullptr;
 }
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_SERIALIZATION_UTIL_H_