Mojo C++ bindings: InterfacePtr<T> and Binding<T> use MultiplexRouter when T passes associated inte…

mojo/public/cpp/bindings/tests/validation_unittest.cc

 // Copyright 2014 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 <stdio.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 390 matching lines @@
   RunValidationTests("resp_boundscheck_", validators.GetHead());
 }
 
 // Test that InterfacePtr<X> applies the correct validators and they don't
 // conflict with each other:
 //   - MessageHeaderValidator
 //   - X::ResponseValidator_
 TEST_F(ValidationIntegrationTest, InterfacePtr) {
   IntegrationTestInterfacePtr interface_ptr = MakeProxy(
       InterfacePtrInfo<IntegrationTestInterface>(testee_endpoint().Pass(), 0u));
-  interface_ptr.internal_state()->router_for_testing()->EnableTestingMode();
+  interface_ptr.internal_state()->EnableTestingMode();
 
   RunValidationTests("integration_intf_resp", test_message_receiver());
   RunValidationTests("integration_msghdr", test_message_receiver());
 }
 
 // Test that Binding<X> applies the correct validators and they don't
 // conflict with each other:
 //   - MessageHeaderValidator
 //   - X::RequestValidator_
 TEST_F(ValidationIntegrationTest, Binding) {
   IntegrationTestInterfaceImpl interface_impl;
   Binding<IntegrationTestInterface> binding(
       &interface_impl,
       MakeRequest<IntegrationTestInterface>(testee_endpoint().Pass()));
-  binding.internal_router()->EnableTestingMode();
+  binding.EnableTestingMode();
 
   RunValidationTests("integration_intf_rqst", test_message_receiver());
   RunValidationTests("integration_msghdr", test_message_receiver());
 }
 
 // Test pointer validation (specifically, that the encoded offset is 32-bit)
 TEST_F(ValidationTest, ValidateEncodedPointer) {
   uint64_t offset;
 
   offset = 0ULL;
@@ skipping 36 matching lines @@
       static_cast<StructWithEnum::EnumWithin>(2)));
   EXPECT_TRUE(StructWithEnum::EnumWithin_IsValidValue(
       static_cast<StructWithEnum::EnumWithin>(3)));
   EXPECT_FALSE(StructWithEnum::EnumWithin_IsValidValue(
       static_cast<StructWithEnum::EnumWithin>(4)));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo