Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

mojo/public/cpp/bindings/associated_group.h

 // Copyright 2015 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_ASSOCIATED_GROUP_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_GROUP_H_
 
 #include <utility>
 
 #include "base/memory/ref_counted.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/scoped_interface_endpoint_handle.h"
 
 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
 // pipe.
 // It is thread safe and cheap to make copies.
 class AssociatedGroup {
  public:
   // Configuration used by CreateAssociatedInterface(). Please see the comments
   // of that method for more details.
   enum AssociatedInterfaceConfig { WILL_PASS_PTR, WILL_PASS_REQUEST };
@@ skipping 41 matching lines @@
       ptr_info->set_handle(std::move(local));
 
       // The implementation is remote, we don't know about its actual version
       // yet.
       ptr_info->set_version(0u);
       request->Bind(std::move(remote));
     }
   }
 
  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
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_GROUP_H_