Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

mojo/public/cpp/bindings/lib/associated_group.cc

Index: mojo/public/cpp/bindings/lib/associated_group.cc
diff --git a/mojo/public/cpp/bindings/lib/associated_group.cc b/mojo/public/cpp/bindings/lib/associated_group.cc
index c3bde6f1b474d7733280cc97899c5b41dbfca5d7..a9c53b5e86a8889bad3890e1119243fd5a721795 100644
--- a/mojo/public/cpp/bindings/lib/associated_group.cc
+++ b/mojo/public/cpp/bindings/lib/associated_group.cc
@@ -4,14 +4,14 @@
 
 #include "mojo/public/cpp/bindings/associated_group.h"
 
-#include "mojo/public/cpp/bindings/lib/multiplex_router.h"
+#include "mojo/public/cpp/bindings/associated_group_controller.h"
 
 namespace mojo {
 
 AssociatedGroup::AssociatedGroup() {}
 
 AssociatedGroup::AssociatedGroup(const AssociatedGroup& other)
-    : router_(other.router_) {}
+    : controller_(other.controller_) {}
 
 AssociatedGroup::~AssociatedGroup() {}
 
@@ -19,17 +19,17 @@ AssociatedGroup& AssociatedGroup::operator=(const AssociatedGroup& other) {
   if (this == &other)
     return *this;
 
-  router_ = other.router_;
+  controller_ = other.controller_;
   return *this;
 }
 
 void AssociatedGroup::CreateEndpointHandlePair(
     ScopedInterfaceEndpointHandle* local_endpoint,
     ScopedInterfaceEndpointHandle* remote_endpoint) {
-  if (!router_)
+  if (!controller_)
     return;
 
-  router_->CreateEndpointHandlePair(local_endpoint, remote_endpoint);
+  controller_->CreateEndpointHandlePair(local_endpoint, remote_endpoint);
 }
 
 }  // namespace mojo