Revert of [mojo-bindings] Use Watch API instead of MessagePumpMojo

mojo/public/cpp/bindings/lib/connector.h

Index: mojo/public/cpp/bindings/lib/connector.h
diff --git a/mojo/public/cpp/bindings/lib/connector.h b/mojo/public/cpp/bindings/lib/connector.h
index 2989d705ef86d522df0b15dc687a3de4f5dd5f75..2d2a5cc97a66fe4b391cf7e61f54c68ad96f76bd 100644
--- a/mojo/public/cpp/bindings/lib/connector.h
+++ b/mojo/public/cpp/bindings/lib/connector.h
@@ -9,10 +9,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
+#include "mojo/message_pump/handle_watcher.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/message.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/cpp/system/watcher.h"
 
 namespace base {
 class Lock;
@@ -141,8 +141,8 @@
   }
 
  private:
-  // Callback of mojo::Watcher.
-  void OnWatcherHandleReady(MojoResult result);
+  // Callback of mojo::common::HandleWatcher.
+  void OnHandleWatcherHandleReady(MojoResult result);
   // Callback of SyncHandleWatcher.
   void OnSyncHandleWatcherHandleReady(MojoResult result);
   void OnHandleReadyInternal(MojoResult result);
@@ -169,7 +169,7 @@
   ScopedMessagePipeHandle message_pipe_;
   MessageReceiver* incoming_receiver_;
 
-  Watcher handle_watcher_;
+  common::HandleWatcher handle_watcher_;
 
   bool error_;
   bool drop_writes_;