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

mojo/edk/embedder/embedder.cc

 // 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.
 
 #include "mojo/edk/embedder/embedder.h"
 
 #include <utility>
 
 #include "base/atomicops.h"
 #include "base/logging.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/master_process_delegate.h"
 #include "mojo/edk/embedder/platform_support.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/edk/embedder/slave_process_delegate.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/channel_manager.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/ipc_support.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/platform_handle_dispatcher.h"
 #include "mojo/edk/system/raw_channel.h"
 #include "mojo/edk/util/ref_ptr.h"
 
+using mojo::platform::PlatformHandleWatcher;
 using mojo::platform::ScopedPlatformHandle;
 using mojo::platform::TaskRunner;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace embedder {
 
 namespace internal {
 
 // Declared in embedder_internal.h.
@@ skipping 83 matching lines @@
 
   *platform_handle =
       static_cast<system::PlatformHandleDispatcher*>(dispatcher.get())
           ->PassPlatformHandle();
   return MOJO_RESULT_OK;
 }
 
 void InitIPCSupport(ProcessType process_type,
                     RefPtr<TaskRunner>&& delegate_thread_task_runner,
                     ProcessDelegate* process_delegate,
-                    RefPtr<TaskRunner>&& io_thread_task_runner,
+                    RefPtr<TaskRunner>&& io_task_runner,
+                    PlatformHandleWatcher* io_watcher,
                     ScopedPlatformHandle platform_handle) {
   // |Init()| must have already been called.
   DCHECK(internal::g_core);
   // And not |InitIPCSupport()| (without |ShutdownIPCSupport()|).
   DCHECK(!internal::g_ipc_support);
 
+  // TODO(vtl): Make IPCSUpport also take |io_watcher|.
   internal::g_ipc_support = new system::IPCSupport(
       internal::g_platform_support, process_type,
       std::move(delegate_thread_task_runner), process_delegate,
-      std::move(io_thread_task_runner), platform_handle.Pass());
+      std::move(io_task_runner), platform_handle.Pass());
 }
 
 void ShutdownIPCSupportOnIOThread() {
   DCHECK(internal::g_ipc_support);
 
   internal::g_ipc_support->ShutdownOnIOThread();
   delete internal::g_ipc_support;
   internal::g_ipc_support = nullptr;
 }
 
@@ skipping 151 matching lines @@
   DCHECK(channel_info);
   DCHECK(internal::g_ipc_support);
 
   system::ChannelManager* channel_manager =
       internal::g_ipc_support->channel_manager();
   channel_manager->WillShutdownChannel(channel_info->channel_id);
 }
 
 }  // namespace embedder
 }  // namespace mojo