EDK: Add PlatformHandleWatcher to IPCSupport class.

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"
@@ skipping 117 matching lines @@
                     RefPtr<TaskRunner>&& delegate_thread_task_runner,
                     ProcessDelegate* process_delegate,
                     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_task_runner), platform_handle.Pass());
+      std::move(io_task_runner), io_watcher, 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;
 }
 
 void ShutdownIPCSupport() {
   DCHECK(internal::g_ipc_support);
 
-  internal::g_ipc_support->io_thread_task_runner()->PostTask([]() {
+  internal::g_ipc_support->io_task_runner()->PostTask([]() {
     // Save these before they get nuked by |ShutdownChannelOnIOThread()|.
     RefPtr<TaskRunner> delegate_thread_task_runner(
         internal::g_ipc_support->delegate_thread_task_runner());
     ProcessDelegate* process_delegate =
         internal::g_ipc_support->process_delegate();
 
     ShutdownIPCSupportOnIOThread();
 
     delegate_thread_task_runner->PostTask(
         [process_delegate]() { process_delegate->OnShutdownComplete(); });
@@ skipping 137 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