EDK: Add TaskRunner and PlatformHandleWatcher to RawChannel.

mojo/edk/system/master_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_MASTER_CONNECTION_MANAGER_H_
 #define MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <unordered_map>
 
 #include "mojo/edk/platform/scoped_platform_handle.h"
 #include "mojo/edk/platform/task_runner.h"
 #include "mojo/edk/system/connection_manager.h"
 #include "mojo/edk/util/mutex.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 
 namespace embedder {
 class MasterProcessDelegate;
 using SlaveInfo = void*;
 }
 
 namespace platform {
+class PlatformHandleWatcher;
 class Thread;
 }
 
 namespace util {
 class AutoResetWaitableEvent;
 }
 
 namespace system {
 
 // The |ConnectionManager| implementation for the master process.
@@ skipping 100 matching lines @@
   // in |Shutdown()| after |private_thread_| is dead. Thus it's safe to "use" on
   // |private_thread_|. (Note that |master_process_delegate_| may only be called
   // from the delegate thread.)
   util::RefPtr<platform::TaskRunner> delegate_thread_task_runner_;
   embedder::MasterProcessDelegate* master_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()|.
   std::unique_ptr<platform::Thread> private_thread_;
   util::RefPtr<platform::TaskRunner> private_thread_task_runner_;
+  platform::PlatformHandleWatcher* private_thread_platform_handle_watcher_;
 
   // The following members are only accessed on |private_thread_|:
   // TODO(vtl): Make the values unique_ptrs.
   std::unordered_map<ProcessIdentifier, Helper*> helpers_;  // Owns its values.
 
   // Note: |mutex_| is not needed in the constructor, |Init()|,
   // |Shutdown()|/|ShutdownOnPrivateThread()|, or the destructor
   util::Mutex mutex_;
 
   ProcessIdentifier next_process_identifier_ MOJO_GUARDED_BY(mutex_);
@@ skipping 16 matching lines @@
   std::unordered_map<ProcessIdentifier, ProcessConnections*> connections_
       MOJO_GUARDED_BY(mutex_);  // Owns its values.
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MasterConnectionManager);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_