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

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 <string>
 #include <utility>
@@ skipping 162 matching lines @@
   AssociatedGroup* associated_group() {
     return endpoint_client_ ? endpoint_client_->associated_group() : nullptr;
   }
 
   void FlushForTesting();
 
   void EnableTestingMode();
 
  protected:
   void BindInternal(ScopedMessagePipeHandle handle,
-                    MultiplexRouter::Config config,
                     scoped_refptr<base::SingleThreadTaskRunner> runner,
                     const char* interface_name,
                     std::unique_ptr<MessageReceiver> request_validator,
                     bool has_sync_methods,
                     MessageReceiverWithResponderStatus* stub,
                     uint32_t interface_version);
 
   scoped_refptr<internal::MultiplexRouter> router_;
   std::unique_ptr<InterfaceEndpointClient> endpoint_client_;
 };
 
 // Uses a multiplexing router. If |Interface| has methods to pass associated
 // interface pointers or requests, this specialization should be used.
 template <typename Interface>
 class BindingState<Interface, true> : public MultiplexedBindingState {
  public:
   explicit BindingState(Interface* impl) : impl_(impl) {
     stub_.set_sink(impl_);
   }
 
   ~BindingState() { Close(); }
 
   void Bind(ScopedMessagePipeHandle handle,
             scoped_refptr<base::SingleThreadTaskRunner> runner) {
     MultiplexedBindingState::BindInternal(
-        std::move(handle),
-        Interface::PassesAssociatedKinds_ ? MultiplexRouter::MULTI_INTERFACE
-                                          : MultiplexRouter::SINGLE_INTERFACE,
-        runner, Interface::Name_,
+        std::move(handle), runner, Interface::Name_,
         base::MakeUnique<typename Interface::RequestValidator_>(),
         Interface::HasSyncMethods_, &stub_, Interface::Version_);
     stub_.serialization_context()->group_controller = router_;
   }
 
   InterfaceRequest<Interface> Unbind() {
     endpoint_client_.reset();
     InterfaceRequest<Interface> request =
         MakeRequest<Interface>(router_->PassMessagePipe());
     router_ = nullptr;
     return request;
   }
 
   Interface* impl() { return impl_; }
 
  private:
   typename Interface::Stub_ stub_;
   Interface* impl_;
 
   DISALLOW_COPY_AND_ASSIGN(BindingState);
 };
 
 }  // namesapce internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDING_STATE_H_