Revert of Mojo: Armed Watchers

ipc/ipc_sync_channel.h

 // Copyright (c) 2012 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 IPC_IPC_SYNC_CHANNEL_H_
 #define IPC_IPC_SYNC_CHANNEL_H_
 
 #include <deque>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_message.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "mojo/public/c/system/types.h"
-#include "mojo/public/cpp/system/simple_watcher.h"
+#include "mojo/public/cpp/system/watcher.h"
 
 namespace base {
 class WaitableEvent;
 };
 
 namespace mojo {
 class SyncHandleRegistry;
+class Watcher;
 }
 
 namespace IPC {
 
 class ChannelFactory;
 class MojoEvent;
 class SyncMessage;
 
 // This is similar to ChannelProxy, with the added feature of supporting sending
 // synchronous messages.
@@ skipping 193 matching lines @@
 
   // Starts the dispatch watcher.
   void StartWatching();
 
   // ChannelProxy overrides:
   void OnChannelInit() override;
 
   scoped_refptr<mojo::SyncHandleRegistry> sync_handle_registry_;
 
   // Used to signal events between the IPC and listener threads.
-  mojo::SimpleWatcher dispatch_watcher_;
+  mojo::Watcher dispatch_watcher_;
 
   // Tracks SyncMessageFilters created before complete channel initialization.
   std::vector<scoped_refptr<SyncMessageFilter>> pre_init_sync_message_filters_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncChannel);
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_SYNC_CHANNEL_H_