Revert of Support early associated interface binding on ChannelMojo

ipc/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 <stdint.h>
 
 #include <map>
@@ skipping 24 matching lines @@
 // ChannelMojo builds a Mojo MessagePipe using the provided message pipe
 // |handle| and builds an associated interface for each direction on the
 // channel.
 //
 // TODO(morrita): Add APIs to create extra MessagePipes to let
 //                Mojo-based objects talk over this Channel.
 //
 class IPC_EXPORT ChannelMojo
     : public Channel,
       public Channel::AssociatedInterfaceSupport,
-      public NON_EXPORTED_BASE(MojoBootstrap::Delegate),
+      public MojoBootstrap::Delegate,
       public NON_EXPORTED_BASE(internal::MessagePipeReader::Delegate) {
  public:
   // Creates a ChannelMojo.
   static std::unique_ptr<ChannelMojo>
   Create(mojo::ScopedMessagePipeHandle handle,
          Mode mode,
          Listener* listener,
          const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner =
             base::ThreadTaskRunnerHandle::Get());
 
@@ skipping 27 matching lines @@
   // These access protected API of IPC::Message, which has ChannelMojo
   // as a friend class.
   static MojoResult WriteToMessageAttachmentSet(
       mojo::Array<mojom::SerializedHandlePtr> handle_buffer,
       Message* message);
   static MojoResult ReadFromMessageAttachmentSet(
       Message* message,
       mojo::Array<mojom::SerializedHandlePtr>* handles);
 
   // MojoBootstrapDelegate implementation
-  void OnPipesAvailable(mojom::ChannelAssociatedPtr sender,
-                        mojom::ChannelAssociatedRequest receiver) override;
-
-  // MessagePipeReader::Delegate
-  void OnPeerPidReceived() override;
-  void OnMessageReceived(const Message& message) override;
-  void OnPipeError() override;
+  void OnPipesAvailable(mojom::ChannelAssociatedPtrInfo send_channel,
+                        mojom::ChannelAssociatedRequest receive_channel,
+                        int32_t peer_pid) override;
+  void OnBootstrapError() override;
   void OnAssociatedInterfaceRequest(
       const std::string& name,
       mojo::ScopedInterfaceEndpointHandle handle) override;
 
+  // MessagePipeReader::Delegate
+  void OnMessageReceived(const Message& message) override;
+  void OnPipeError() override;
+
  private:
   ChannelMojo(
       mojo::ScopedMessagePipeHandle handle,
       Mode mode,
       Listener* listener,
       const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner);
 
+  void InitMessageReader(mojom::ChannelAssociatedPtrInfo sender,
+                         mojom::ChannelAssociatedRequest receiver,
+                         base::ProcessId peer_pid);
+
   // Channel::AssociatedInterfaceSupport:
   mojo::AssociatedGroup* GetAssociatedGroup() override;
   void AddGenericAssociatedInterface(
       const std::string& name,
       const GenericAssociatedInterfaceFactory& factory) override;
   void GetGenericRemoteAssociatedInterface(
       const std::string& name,
       mojo::ScopedInterfaceEndpointHandle handle) override;
+  void SetProxyTaskRunner(
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner) override;
+
+  // 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;
 
   // A TaskRunner which runs tasks on the ChannelMojo's owning thread.
   scoped_refptr<base::TaskRunner> task_runner_;
 
   const mojo::MessagePipeHandle pipe_;
   std::unique_ptr<MojoBootstrap> bootstrap_;
   Listener* listener_;
 
-  std::unique_ptr<internal::MessagePipeReader> message_reader_;
-
-  base::Lock associated_interface_lock_;
   std::map<std::string, GenericAssociatedInterfaceFactory>
       associated_interfaces_;
 
+  // Guards access to the fields below.
+  mutable base::Lock lock_;
+  std::unique_ptr<internal::MessagePipeReader, ReaderDeleter> message_reader_;
+  std::vector<std::unique_ptr<Message>> pending_messages_;
+  bool waiting_connect_;
+
   base::WeakPtrFactory<ChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_MOJO_H_