EDK: Add TaskRunner and PlatformHandleWatcher to RawChannel.

mojo/edk/system/slave_connection_manager.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
 #define MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
 
 #include <memory>
 
 #include "mojo/edk/embedder/slave_process_delegate.h"
@@ skipping 10 matching lines @@
 class TaskRunner;
 }
 
 namespace mojo {
 
 namespace embedder {
 class SlaveProcessDelegate;
 }
 
 namespace platform {
+class PlatformHandleWatcher;
 class Thread;
 }
 
 namespace system {
 
 // The |ConnectionManager| implementation for slave processes.
 //
 // This class is thread-safe (except that no public methods may be called from
 // its internal, private thread), with condition that |Init()| be called before
 // anything else and |Shutdown()| be called before destruction (and no other
@@ skipping 61 matching lines @@
   // |private_thread_|. (Note that |slave_process_delegate_| may only be called
   // from the delegate thread.)
   util::RefPtr<platform::TaskRunner> delegate_thread_task_runner_;
   embedder::SlaveProcessDelegate* slave_process_delegate_;
 
   // This is a private I/O thread on which this class does the bulk of its work.
   // It is started in |Init()| and terminated in |Shutdown()|.
   // TODO(vtl): This isn't really necessary.
   std::unique_ptr<platform::Thread> private_thread_;
   util::RefPtr<platform::TaskRunner> private_thread_task_runner_;
+  platform::PlatformHandleWatcher* private_thread_platform_handle_watcher_;
 
   // Only accessed on |private_thread_|:
   std::unique_ptr<RawChannel> raw_channel_;
   enum AwaitingAckType {
     NOT_AWAITING_ACK,
     AWAITING_ACCEPT_CONNECT_ACK,
     AWAITING_CANCEL_CONNECT_ACK,
     AWAITING_CONNECT_ACK
   };
   AwaitingAckType awaiting_ack_type_;
@@ skipping 32 matching lines @@
   util::Mutex mutex_;
   util::AutoResetWaitableEvent event_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(SlaveConnectionManager);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_