Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

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

 // Copyright 2016 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_HANDLE_INTERFACE_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_HANDLE_INTERFACE_SERIALIZATION_H_
 
+#include "mojo/public/cpp/bindings/associated_group_controller.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/associated_interface_request.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
-#include "mojo/public/cpp/bindings/lib/multiplex_router.h"
 #include "mojo/public/cpp/bindings/lib/serialization_context.h"
 #include "mojo/public/cpp/bindings/lib/serialization_forward.h"
 #include "mojo/public/cpp/system/handle.h"
 
 namespace mojo {
 namespace internal {
 
 template <typename T>
 struct Serializer<AssociatedInterfacePtrInfo<T>,
                   AssociatedInterfacePtrInfo<T>> {
   static void Serialize(AssociatedInterfacePtrInfo<T>& input,
                         AssociatedInterface_Data* output,
                         SerializationContext* context) {
     DCHECK(!input.handle().is_valid() || !input.handle().is_local());
-    DCHECK_EQ(input.handle().router(), context->router.get());
+    DCHECK_EQ(input.handle().group_controller(),
+              context->group_controller.get());
     output->version = input.version();
     output->interface_id = input.PassHandle().release();
   }
 
   static bool Deserialize(AssociatedInterface_Data* input,
                           AssociatedInterfacePtrInfo<T>* output,
                           SerializationContext* context) {
-    output->set_handle(context->router->CreateLocalEndpointHandle(
+    output->set_handle(context->group_controller->CreateLocalEndpointHandle(
         FetchAndReset(&input->interface_id)));
     output->set_version(input->version);
     return true;
   }
 };
 
 template <typename T>
 struct Serializer<AssociatedInterfaceRequest<T>,
                   AssociatedInterfaceRequest<T>> {
   static void Serialize(AssociatedInterfaceRequest<T>& input,
                         AssociatedInterfaceRequest_Data* output,
                         SerializationContext* context) {
     DCHECK(!input.handle().is_valid() || !input.handle().is_local());
-    DCHECK_EQ(input.handle().router(), context->router.get());
+    DCHECK_EQ(input.handle().group_controller(),
+              context->group_controller.get());
     output->interface_id = input.PassHandle().release();
   }
 
   static bool Deserialize(AssociatedInterfaceRequest_Data* input,
                           AssociatedInterfaceRequest<T>* output,
                           SerializationContext* context) {
-    output->Bind(context->router->CreateLocalEndpointHandle(
+    output->Bind(context->group_controller->CreateLocalEndpointHandle(
         FetchAndReset(&input->interface_id)));
     return true;
   }
 };
 
 template <typename T>
 struct Serializer<InterfacePtr<T>, InterfacePtr<T>> {
   static void Serialize(InterfacePtr<T>& input,
                         Interface_Data* output,
                         SerializationContext* context) {
@@ skipping 41 matching lines @@
                           SerializationContext* context) {
     *output = context->handles.TakeHandleAs<T>(*input);
     return true;
   }
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_HANDLE_INTERFACE_SERIALIZATION_H_