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

mojo/edk/system/channel.cc

 // Copyright 2013 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/channel.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "mojo/edk/system/endpoint_relayer.h"
 #include "mojo/edk/system/transport_data.h"
 #include "mojo/edk/util/string_printf.h"
 
+using mojo::platform::PlatformHandleWatcher;
 using mojo::platform::ScopedPlatformHandle;
+using mojo::platform::TaskRunner;
 using mojo::util::MakeRefCounted;
 using mojo::util::MutexLocker;
 using mojo::util::RefPtr;
 using mojo::util::StringPrintf;
 
 namespace mojo {
 namespace system {
 
 namespace {
 
 struct SerializedEndpoint {
   // This is the endpoint ID on the receiving side, and should be a "remote ID".
   // (The receiving side should already have had an endpoint attached and been
   // run via the |Channel|s. This endpoint will have both IDs assigned, so this
   // ID is only needed to associate that endpoint with a particular dispatcher.)
   ChannelEndpointId receiver_endpoint_id;
 };
 
 }  // namespace
 
-void Channel::Init(std::unique_ptr<RawChannel> raw_channel) {
+void Channel::Init(RefPtr<TaskRunner>&& io_task_runner,
+                   PlatformHandleWatcher* io_watcher,
+                   std::unique_ptr<RawChannel> raw_channel) {
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
   DCHECK(thread_checker_.IsCreationThreadCurrent());
 #endif  // !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
   DCHECK(raw_channel);
 
   // No need to take |mutex_|, since this must be called before this object
   // becomes thread-safe.
   DCHECK(!is_running_);
   raw_channel_ = std::move(raw_channel);
+  // TODO(vtl): Add explicit |io_task_runner| and |io_watcher| arguments to
+  // |RawChannel::Init()| and pass them on.
   raw_channel_->Init(this);
   is_running_ = true;
 }
 
 void Channel::SetChannelManager(ChannelManager* channel_manager) {
   DCHECK(channel_manager);
 
   MutexLocker locker(&mutex_);
   DCHECK(!is_shutting_down_);
   DCHECK(!channel_manager_);
@@ skipping 586 matching lines @@
            << ", local ID " << local_id << ", remote ID " << remote_id;
   std::unique_ptr<MessageInTransit> message(new MessageInTransit(
       MessageInTransit::Type::CHANNEL, subtype, num_bytes, bytes));
   message->set_source_id(local_id);
   message->set_destination_id(remote_id);
   return WriteMessage(std::move(message));
 }
 
 }  // namespace system
 }  // namespace mojo