ChannelMojo: Handle when ChannelMojo outlives ChannelMojoHost

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 44 matching lines @@
 // TODO(morrita): Extract handle creation part of IPC::Channel into
 //                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:
   // Create ChannelMojo. A bootstrap channel is created as well.
-  // |host| must not be null.
+  // |host| must not be null for server channels.
   static scoped_ptr<ChannelMojo> Create(ChannelMojoHost* host,
                                         const ChannelHandle& channel_handle,
                                         Mode mode,
                                         Listener* listener);
 
   // Create a factory object for ChannelMojo.
   // The factory is used to create Mojo-based ChannelProxy family.
   // |host| must not be null.
   static scoped_ptr<ChannelFactory> CreateServerFactory(
       ChannelMojoHost* host,
@@ skipping 34 matching lines @@
       mojo::embedder::ScopedPlatformHandle handle) OVERRIDE;
   virtual void OnBootstrapError() OVERRIDE;
 
   // Called from MessagePipeReader implementations
   void OnMessageReceived(Message& message);
   void OnConnected(mojo::ScopedMessagePipeHandle pipe);
   void OnPipeClosed(internal::MessagePipeReader* reader);
   void OnPipeError(internal::MessagePipeReader* reader);
   void set_peer_pid(base::ProcessId pid) { peer_pid_ = pid; }
 
+  void HostWasDestroyed();

[viettrungluu, 2014/09/25 19:38:34]

I don't think this is used (or implemented).

[Hajime Morrita, 2014/09/25 22:00:03]

Oops. Removed.

+
  protected:
   ChannelMojo(ChannelMojoHost* host,
               const ChannelHandle& channel_handle,
               Mode mode,
               Listener* listener);
 
  private:
   struct ChannelInfoDeleter {
     void operator()(mojo::embedder::ChannelInfo* ptr) const;
   };
 
   // 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 InitControlReader(mojo::embedder::ScopedPlatformHandle handle);
 
   scoped_ptr<MojoBootstrap> bootstrap_;
-  ChannelMojoHost* const host_;
+  base::WeakPtr<ChannelMojoHost> host_;
   Mode mode_;
   Listener* listener_;
   base::ProcessId peer_pid_;
   scoped_ptr<mojo::embedder::ChannelInfo,
              ChannelInfoDeleter> channel_info_;
 
   scoped_ptr<internal::ControlReader, ReaderDeleter> control_reader_;
   scoped_ptr<internal::MessageReader, ReaderDeleter> message_reader_;
   ScopedVector<Message> pending_messages_;
 
   base::WeakPtrFactory<ChannelMojo> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelMojo);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_MOJO_H_