Fix race condition with multiplexed message pipes.

mojo/edk/system/broker_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_EDK_SYSTEM_BROKER_STATE_H_
 #define MOJO_EDK_SYSTEM_BROKER_STATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
@@ skipping 49 matching lines @@
   ~BrokerState() override;
 
   // Checks if there's a direct channel between the two processes, and if not
   // creates one and tells them about it.
   void EnsureProcessesConnected(base::ProcessId pid1, base::ProcessId pid2);
 
   // Callback when a RoutedRawChannel is destroyed for cleanup.
   // Called on the IO thread.
   void ChannelDestructed(RoutedRawChannel* channel);
 
+  // Helper method to connect the given MessagePipe to the channel.
+  void AttachMessagePipe(MessagePipeDispatcher* message_pipe,
+                         uint64_t pipe_id,
+                         RoutedRawChannel* raw_channel);
+
 #if defined(OS_WIN)
   // Used in the parent (unsandboxed) process to hold a mapping between HANDLES
   // and tokens. When a child process wants to send a HANDLE to another process,
   // it exchanges it to a token and then the other process exchanges that token
   // back to a HANDLE.
   base::Lock token_map_lock_;
   base::hash_map<uint64_t, HANDLE> token_map_;
 #endif
 
   // For pending connects originiating in this process.
@@ skipping 24 matching lines @@
   RoutedRawChannel* in_process_pipes_channel1_;
   RoutedRawChannel* in_process_pipes_channel2_;
 
   DISALLOW_COPY_AND_ASSIGN(BrokerState);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_BROKER_STATE_H_