Mojo C++ bindings: always use MultiplexRouter with InterfacePtr/Binding.

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

 // 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.
 
 #include "mojo/public/cpp/bindings/lib/binding_state.h"
 
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 
 namespace mojo {
 namespace internal {
@@ skipping 123 matching lines @@
 void MultiplexedBindingState::EnableTestingMode() {
   DCHECK(is_bound());
   router_->EnableTestingMode();
 }
 
 void MultiplexedBindingState::BindInternal(
     ScopedMessagePipeHandle handle,
     scoped_refptr<base::SingleThreadTaskRunner> runner,
     const char* interface_name,
     std::unique_ptr<MessageReceiver> request_validator,
+    bool passes_associated_kinds,
     bool has_sync_methods,
     MessageReceiverWithResponderStatus* stub,
     uint32_t interface_version) {
   DCHECK(!router_);
 
-  router_ = new MultiplexRouter(
-      std::move(handle), MultiplexRouter::MULTI_INTERFACE, false, runner);
+  MultiplexRouter::Config config =
+      passes_associated_kinds
+          ? MultiplexRouter::MULTI_INTERFACE
+          : (has_sync_methods
+                 ? MultiplexRouter::SINGLE_INTERFACE_WITH_SYNC_METHODS
+                 : MultiplexRouter::SINGLE_INTERFACE);
+  router_ = new MultiplexRouter(std::move(handle), config, false, runner);
   router_->SetMasterInterfaceName(interface_name);
 
   endpoint_client_.reset(new InterfaceEndpointClient(
       router_->CreateLocalEndpointHandle(kMasterInterfaceId), stub,
       std::move(request_validator), has_sync_methods, std::move(runner),
       interface_version));
 }
 
 }  // namesapce internal
 }  // namespace mojo