EDK: Add PlatformHandleWatcher to Channel (and ChannelManager) classes.

mojo/edk/system/channel_manager.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 MOJO_EDK_SYSTEM_CHANNEL_MANAGER_H_
 #define MOJO_EDK_SYSTEM_CHANNEL_MANAGER_H_
 
 #include <stdint.h>
 
 #include <functional>
@@ skipping 10 matching lines @@
 namespace base {
 class TaskRunner;
 }
 
 namespace mojo {
 
 namespace embedder {
 class PlatformSupport;
 }
 
+namespace platform {
+class PlatformHandleWatcher;
+}
+
 namespace system {
 
 class Channel;
 class ChannelEndpoint;
 class ConnectionManager;
 class MessagePipeDispatcher;
 
 // This class manages and "owns" |Channel|s (which typically connect to other
 // processes) for a given process. This class is thread-safe, except as
 // specifically noted.
 class ChannelManager {
  public:
-  // |io_thread_task_runner| should be the |TaskRunner| for the I/O thread, on
-  // which this channel manager will create all channels. Connection manager is
-  // optional and may be null. All arguments (if non-null) must remain alive at
-  // least until after shutdown completion.
+  // |io_task_runner| and |io_watcher| should be the |TaskRunner| and
+  // |PlatformHandleWatcher|, respectively, for the I/O thread, on which this
+  // channel manager will create all channels. |connection_manager| is optional
+  // and may be null. All arguments (if non-null) must remain alive at least
+  // until after shutdown completion.
   ChannelManager(embedder::PlatformSupport* platform_support,
-                 util::RefPtr<platform::TaskRunner>&& io_thread_task_runner,
+                 util::RefPtr<platform::TaskRunner>&& io_task_runner,
+                 platform::PlatformHandleWatcher* io_watcher,
                  ConnectionManager* connection_manager);
   ~ChannelManager();
 
   // Shuts down the channel manager, including shutting down all channels (as if
   // |ShutdownChannelOnIOThread()| were called for each channel). This must be
   // called from the I/O thread (given to the constructor) and completes
   // synchronously. This, or |Shutdown()|, must be called before destroying this
   // object.
   void ShutdownOnIOThread();
 
   // Like |ShutdownOnIOThread()|, but may be called from any thread. On
-  // completion, will call |callback| ("on" |io_thread_task_runner| if
+  // completion, will call |callback| ("on" |io_task_runner| if
   // |callback_thread_task_runner| is null else by posted using
   // |callback_thread_task_runner|). Note: This will always post a task to the
   // I/O thread, even it is the current thread.
   // TODO(vtl): Consider if this is really necessary, since it only has one use
   // (in tests).
   void Shutdown(
       std::function<void()>&& callback,
       util::RefPtr<platform::TaskRunner>&& callback_thread_task_runner);
 
   // Creates a |Channel| and adds it to the set of channels managed by this
@@ skipping 54 matching lines @@
   // Used by |CreateChannelOnIOThread()| and |CreateChannel()|. Called on the
   // I/O thread. |bootstrap_channel_endpoint| is optional and may be null.
   // Returns the newly-created |Channel|.
   util::RefPtr<Channel> CreateChannelOnIOThreadHelper(
       ChannelId channel_id,
       platform::ScopedPlatformHandle platform_handle,
       util::RefPtr<ChannelEndpoint>&& bootstrap_channel_endpoint);
 
   // Note: These must not be used after shutdown.
   embedder::PlatformSupport* const platform_support_;
-  const util::RefPtr<platform::TaskRunner> io_thread_task_runner_;
+  const util::RefPtr<platform::TaskRunner> io_task_runner_;
+  platform::PlatformHandleWatcher* const io_watcher_;
   ConnectionManager* const connection_manager_;
 
   // Note: |Channel| methods should not be called under |mutex_|.
   // TODO(vtl): Annotate the above rule using |MOJO_ACQUIRED_{BEFORE,AFTER}()|,
   // once clang actually checks such annotations.
   // https://github.com/domokit/mojo/issues/313
   mutable util::Mutex mutex_;
 
   using ChannelIdToChannelMap =
       std::unordered_map<ChannelId, util::RefPtr<Channel>>;
   ChannelIdToChannelMap channels_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CHANNEL_MANAGER_H_