EDK: Add a PlatformHandleWatcher argument to embedder::InitIPCSupport().

mojo/edk/embedder/embedder.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_EMBEDDER_EMBEDDER_H_
 #define MOJO_EDK_EMBEDDER_EMBEDDER_H_
 
 #include <functional>
 #include <memory>
 #include <string>
 
 #include "mojo/edk/embedder/channel_info_forward.h"
 #include "mojo/edk/embedder/process_type.h"
 #include "mojo/edk/embedder/slave_info.h"
 #include "mojo/edk/platform/scoped_platform_handle.h"
 #include "mojo/edk/platform/task_runner.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 namespace mojo {
+
+namespace platform {
+class PlatformHandleWatcher;
+}
+
 namespace embedder {
 
 struct Configuration;
 class PlatformSupport;
 class ProcessDelegate;
 
 // Basic configuration/initialization ------------------------------------------
 
 // |Init()| sets up the basic Mojo system environment, making the |Mojo...()|
 // functions available and functional. This is never shut down (except in tests
@@ skipping 42 matching lines @@
 // (This may only be done after |Init()|.)
 //
 // This subsystem may be shut down, using |ShutdownIPCSupportOnIOThread()| or
 // |ShutdownIPCSupport()|. None of the IPC functions may be called while or
 // after either of these is called.
 
 // Initializes a process of the given type; to be called after |Init()|.
 //   - |process_delegate| must be a process delegate of the appropriate type
 //     corresponding to |process_type|; its methods will be called on
 //     |delegate_thread_task_runner|.
-//   - |delegate_thread_task_runner|, |process_delegate|, and
-//     |io_thread_task_runner| should live at least until
-//     |ShutdownIPCSupport()|'s callback has been run or
-//     |ShutdownIPCSupportOnIOThread()| has completed.
+//   - |delegate_thread_task_runner|, |process_delegate|, |io_task_runner|,
+//     and |io_watcher| should live at least until |ShutdownIPCSupport()|'s
+//     callback has been run or |ShutdownIPCSupportOnIOThread()| has completed.
 //   - For slave processes (i.e., |process_type| is |ProcessType::SLAVE|),
 //     |platform_handle| should be connected to the handle passed to
 //     |ConnectToSlave()| (in the master process). For other processes,
 //     |platform_handle| is ignored (and should not be valid).
 void InitIPCSupport(
     ProcessType process_type,
     util::RefPtr<platform::TaskRunner>&& delegate_thread_task_runner,
     ProcessDelegate* process_delegate,
-    util::RefPtr<platform::TaskRunner>&& io_thread_task_runner,
+    util::RefPtr<platform::TaskRunner>&& io_task_runner,
+    platform::PlatformHandleWatcher* io_watcher,
     platform::ScopedPlatformHandle platform_handle);
 
 // Shuts down the subsystem initialized by |InitIPCSupport()|. This must be
 // called on the I/O thread (given to |InitIPCSupport()|). This completes
 // synchronously and does not result in a call to the process delegate's
 // |OnShutdownComplete()|.
 void ShutdownIPCSupportOnIOThread();
 
 // Like |ShutdownIPCSupportOnIOThread()|, but may be called from any thread,
 // signaling shutdown completion via the process delegate's
@@ skipping 124 matching lines @@
 
 // Inform the channel that it will soon be destroyed (doing so is optional).
 // This may be called from any thread, but the caller must ensure that this is
 // called before |DestroyChannel()|.
 void WillDestroyChannelSoon(ChannelInfo* channel_info);
 
 }  // namespace embedder
 }  // namespace mojo
 
 #endif  // MOJO_EDK_EMBEDDER_EMBEDDER_H_