| Index: third_party/mojo/src/mojo/edk/system/channel.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/channel.h b/third_party/mojo/src/mojo/edk/system/channel.h
|
| index 396185908dd48b1f989425198bb61ac00a66e6f8..93ba87ae95743ec56b7b4ec91a1a4c766a8f1c89 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/channel.h
|
| +++ b/third_party/mojo/src/mojo/edk/system/channel.h
|
| @@ -54,8 +54,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel
|
| : public base::RefCountedThreadSafe<Channel>,
|
| public RawChannel::Delegate {
|
| public:
|
| - // |platform_support| (typically owned by |Core|) must remain alive until
|
| - // after |Shutdown()| is called.
|
| + // |platform_support| must remain alive until after |Shutdown()| is called.
|
| explicit Channel(embedder::PlatformSupport* platform_support);
|
|
|
| // This must be called on the creation thread before any other methods are
|
| @@ -65,7 +64,9 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel
|
|
|
| // Sets the channel manager associated with this channel. This should be set
|
| // at most once and only called before |WillShutdownSoon()| (and
|
| - // |Shutdown()|).
|
| + // |Shutdown()|). (This is called by the channel manager when adding a
|
| + // channel; this should not be called before the channel is managed by the
|
| + // channel manager.)
|
| void SetChannelManager(ChannelManager* channel_manager);
|
|
|
| // This must be called on the creation thread before destruction (which can
|
|
|