Mojo C++ bindings: remove the lock in MultiplexRouter if it only serves a single interface.

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

 // 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.
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 199 matching lines @@
 
   base::TimeDelta duration = paddle0.Serve(kTestIterations);
 
   test::LogPerfResult("RouterPingPong", nullptr,
                       kTestIterations / duration.InSecondsF(), "pings/second");
 }
 
 TEST_F(MojoBindingsPerftest, MultiplexRouterPingPong) {
   MessagePipe pipe;
   scoped_refptr<internal::MultiplexRouter> router0(
-      new internal::MultiplexRouter(true, std::move(pipe.handle0),
-                                    base::ThreadTaskRunnerHandle::Get()));
+      new internal::MultiplexRouter(std::move(pipe.handle0),
+                                    internal::MultiplexRouter::SINGLE_INTERFACE,
+                                    true, base::ThreadTaskRunnerHandle::Get()));
   scoped_refptr<internal::MultiplexRouter> router1(
-      new internal::MultiplexRouter(false, std::move(pipe.handle1),
-                                    base::ThreadTaskRunnerHandle::Get()));
+      new internal::MultiplexRouter(
+          std::move(pipe.handle1), internal::MultiplexRouter::SINGLE_INTERFACE,
+          false, base::ThreadTaskRunnerHandle::Get()));
 
   PingPongPaddle paddle0(nullptr);
   PingPongPaddle paddle1(nullptr);
 
   InterfaceEndpointClient client0(
       router0->CreateLocalEndpointHandle(kMasterInterfaceId), &paddle0, nullptr,
       false, base::ThreadTaskRunnerHandle::Get(), 0u);
   InterfaceEndpointClient client1(
       router1->CreateLocalEndpointHandle(kMasterInterfaceId), &paddle1, nullptr,
       false, base::ThreadTaskRunnerHandle::Get(), 0u);
@@ skipping 60 matching lines @@
       test::LogPerfResult("RouterDispatchCost", nullptr,
                           kIterations[i] / duration.InSecondsF(),
                           "times/second");
     }
   }
 }
 
 TEST_F(MojoBindingsPerftest, MultiplexRouterDispatchCost) {
   MessagePipe pipe;
   scoped_refptr<internal::MultiplexRouter> router(new internal::MultiplexRouter(
-      true, std::move(pipe.handle0), base::ThreadTaskRunnerHandle::Get()));
+      std::move(pipe.handle0), internal::MultiplexRouter::SINGLE_INTERFACE,
+      true, base::ThreadTaskRunnerHandle::Get()));
   CounterReceiver receiver;
   InterfaceEndpointClient client(
       router->CreateLocalEndpointHandle(kMasterInterfaceId), &receiver, nullptr,
       false, base::ThreadTaskRunnerHandle::Get(), 0u);
 
   static const uint32_t kIterations[] = {1000, 3000000};
 
   for (size_t i = 0; i < 2; ++i) {
     receiver.Reset();
     base::TimeTicks start_time = base::TimeTicks::Now();
@@ skipping 11 matching lines @@
     if (i == 1) {
       test::LogPerfResult("MultiplexRouterDispatchCost", nullptr,
                           kIterations[i] / duration.InSecondsF(),
                           "times/second");
     }
   }
 }
 
 }  // namespace
 }  // namespace mojo