Mojo IPC threading fixes

ipc/mojo/ipc_channel_mojo.h

 // 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.
 
 #ifndef IPC_IPC_CHANNEL_MOJO_H_
 #define IPC_IPC_CHANNEL_MOJO_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 33 matching lines @@
 //                separate class to clarify what ChannelMojo relies
 //                on.
 // TODO(morrita): Add APIs to create extra MessagePipes to let
 //                Mojo-based objects talk over this Channel.
 //
 class IPC_MOJO_EXPORT ChannelMojo
     : public Channel,
       public MojoBootstrap::Delegate,
       public NON_EXPORTED_BASE(internal::MessagePipeReader::Delegate) {
  public:
+  using CreateMessagingPipeCallback =
+      base::Callback<void(mojo::ScopedMessagePipeHandle)>;
+  using CreateMessagingPipeOnIOThreadCallback =
+      base::Callback<void(mojo::ScopedMessagePipeHandle,
+                          mojo::embedder::ChannelInfo*)>;
+
   class Delegate {
    public:
     virtual ~Delegate() {}
     virtual base::WeakPtr<Delegate> ToWeakPtr() = 0;
     virtual void OnChannelCreated(base::WeakPtr<ChannelMojo> channel) = 0;
   };
 
   // True if ChannelMojo should be used regardless of the flag.
   static bool ShouldBeUsed();
 
@@ skipping 54 matching lines @@
   void OnPipeClosed(internal::MessagePipeReader* reader) override;
   void OnPipeError(internal::MessagePipeReader* reader) override;
 
  protected:
   ChannelMojo(Delegate* delegate,
               scoped_refptr<base::TaskRunner> io_runner,
               const ChannelHandle& channel_handle,
               Mode mode,
               Listener* listener);
 
-  mojo::ScopedMessagePipeHandle CreateMessagingPipe(
-      mojo::embedder::ScopedPlatformHandle handle);
+  void CreateMessagingPipe(mojo::embedder::ScopedPlatformHandle handle,
+                           const CreateMessagingPipeCallback& callback);
   void InitMessageReader(mojo::ScopedMessagePipeHandle pipe, int32_t peer_pid);
 
   Listener* listener() const { return listener_; }
   void set_peer_pid(base::ProcessId pid) { peer_pid_ = pid; }
 
  private:
   struct ChannelInfoDeleter {
+    explicit ChannelInfoDeleter(scoped_refptr<base::TaskRunner> io_runer);

[jam, 2015/05/11 15:53:25]

nit: io_runner

[Ken Rockot(use gerrit already), 2015/05/11 16:11:53]

Done.

+    ~ChannelInfoDeleter();
+
     void operator()(mojo::embedder::ChannelInfo* ptr) const;
+
+    scoped_refptr<base::TaskRunner> io_runner;
   };
 
   // ChannelMojo needs to kill its MessagePipeReader in delayed manner
   // because the channel wants to kill these readers during the
   // notifications invoked by them.
   typedef internal::MessagePipeReader::DelayedDeleter ReaderDeleter;
 
   void InitOnIOThread(ChannelMojo::Delegate* delegate);
 
+  static void CreateMessagingPipeOnIOThread(
+      mojo::embedder::ScopedPlatformHandle handle,
+      scoped_refptr<base::TaskRunner> callback_runner,
+      const CreateMessagingPipeOnIOThreadCallback& callback);
+  void OnMessagingPipeCreated(const CreateMessagingPipeCallback& callback,
+                              mojo::ScopedMessagePipeHandle handle,
+                              mojo::embedder::ChannelInfo* channel_info);
+
   scoped_ptr<MojoBootstrap> bootstrap_;
   base::WeakPtr<Delegate> delegate_;
   Mode mode_;
   Listener* listener_;
   base::ProcessId peer_pid_;
   scoped_refptr<base::TaskRunner> io_runner_;
   scoped_ptr<mojo::embedder::ChannelInfo,
              ChannelInfoDeleter> channel_info_;
 
   // Guards |message_reader_| and |pending_messages_|
   //
   // * The contents of |pending_messages_| can be modified from any thread.
   // * |message_reader_| is modified only from the IO thread,
   //   but they can be referenced from other threads.
   base::Lock lock_;
   scoped_ptr<internal::MessagePipeReader, ReaderDeleter> message_reader_;
   ScopedVector<Message> pending_messages_;
 
   scoped_ptr<ScopedIPCSupport> ipc_support_;
 
   base::WeakPtrFactory<ChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_MOJO_H_