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

mojo/edk/system/ipc_support.cc

 // Copyright 2015 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/system/ipc_support.h"
 
 #include <type_traits>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 49 matching lines @@
       connection_manager_.reset(
           new system::SlaveConnectionManager(platform_support));
       static_cast<system::SlaveConnectionManager*>(connection_manager_.get())
           ->Init(
               delegate_thread_task_runner_.Clone(),
               static_cast<embedder::SlaveProcessDelegate*>(process_delegate_),
               platform_handle.Pass());
       break;
   }
 
-  channel_manager_.reset(new ChannelManager(
-      platform_support, io_task_runner_.Clone(), connection_manager_.get()));
+  channel_manager_.reset(
+      new ChannelManager(platform_support, io_task_runner_.Clone(), io_watcher_,
+                         connection_manager_.get()));
 }
 
 IPCSupport::~IPCSupport() {
   DCHECK_EQ(process_type_, embedder::ProcessType::UNINITIALIZED);
 }
 
 void IPCSupport::ShutdownOnIOThread() {
   DCHECK_NE(process_type_, embedder::ProcessType::UNINITIALIZED);
 
   channel_manager_->ShutdownOnIOThread();
@@ skipping 86 matching lines @@
   CHECK_EQ(connection_manager()->Connect(connection_id, &peer_id, &is_first,
                                          &platform_connection_handle),
            ConnectionManager::Result::SUCCESS_CONNECT_NEW_CONNECTION);
   DCHECK_EQ(peer_id, system::kMasterProcessIdentifier);
   DCHECK(platform_connection_handle.is_valid());
   return platform_connection_handle;
 }
 
 }  // namespace system
 }  // namespace mojo