Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

mojo/public/cpp/bindings/lib/binding_state.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_LIB_BINDING_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
+#include "mojo/public/cpp/bindings/interface_endpoint_client.h"
+#include "mojo/public/cpp/bindings/interface_id.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/filter_chain.h"
-#include "mojo/public/cpp/bindings/lib/interface_endpoint_client.h"
-#include "mojo/public/cpp/bindings/lib/interface_id.h"
 #include "mojo/public/cpp/bindings/lib/message_header_validator.h"
 #include "mojo/public/cpp/bindings/lib/multiplex_router.h"
 #include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace mojo {
 namespace internal {
 
 template <typename Interface, bool use_multiplex_router>
@@ skipping 112 matching lines @@
   }
 
   ~BindingState() { Close(); }
 
   void Bind(ScopedMessagePipeHandle handle,
             scoped_refptr<base::SingleThreadTaskRunner> runner) {
     DCHECK(!router_);
 
     router_ = new internal::MultiplexRouter(false, std::move(handle), runner);
     router_->SetMasterInterfaceName(Interface::Name_);
-    stub_.serialization_context()->router = router_;
+    stub_.serialization_context()->group_controller = router_;
 
-    endpoint_client_.reset(new internal::InterfaceEndpointClient(
-        router_->CreateLocalEndpointHandle(internal::kMasterInterfaceId),
+    endpoint_client_.reset(new InterfaceEndpointClient(
+        router_->CreateLocalEndpointHandle(kMasterInterfaceId),
         &stub_, base::WrapUnique(new typename Interface::RequestValidator_()),
         Interface::HasSyncMethods_, std::move(runner)));
 
     endpoint_client_->set_connection_error_handler(
         base::Bind(&BindingState::RunConnectionErrorHandler,
                    base::Unretained(this)));
   }
 
   bool HasAssociatedInterfaces() const {
     return router_ ? router_->HasAssociatedEndpoints() : false;
@@ skipping 56 matching lines @@
     router_->EnableTestingMode();
   }
 
  private:
   void RunConnectionErrorHandler() {
     if (!connection_error_handler_.is_null())
       connection_error_handler_.Run();
   }
 
   scoped_refptr<internal::MultiplexRouter> router_;
-  std::unique_ptr<internal::InterfaceEndpointClient> endpoint_client_;
+  std::unique_ptr<InterfaceEndpointClient> endpoint_client_;
 
   typename Interface::Stub_ stub_;
   Interface* impl_;
   base::Closure connection_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 }  // namesapce internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_