Revert of Mojo: Armed Watchers

content/child/web_data_consumer_handle_impl.cc

Index: content/child/web_data_consumer_handle_impl.cc
diff --git a/content/child/web_data_consumer_handle_impl.cc b/content/child/web_data_consumer_handle_impl.cc
index b40f479861e1ba145c80e339da7f8bb6dd80d81c..f81221d85b8e9f97d1cc1979109ea50f7cd983a2 100644
--- a/content/child/web_data_consumer_handle_impl.cc
+++ b/content/child/web_data_consumer_handle_impl.cc
@@ -37,9 +37,7 @@
 WebDataConsumerHandleImpl::ReaderImpl::ReaderImpl(
     scoped_refptr<Context> context,
     Client* client)
-    : context_(context),
-      handle_watcher_(FROM_HERE, mojo::SimpleWatcher::ArmingPolicy::AUTOMATIC),
-      client_(client) {
+    : context_(context), handle_watcher_(FROM_HERE), client_(client) {
   if (client_)
     StartWatching();
 }
@@ -132,7 +130,7 @@
 }
 
 void WebDataConsumerHandleImpl::ReaderImpl::StartWatching() {
-  handle_watcher_.Watch(
+  handle_watcher_.Start(
       context_->handle().get(), MOJO_HANDLE_SIGNAL_READABLE,
       base::Bind(&ReaderImpl::OnHandleGotReadable, base::Unretained(this)));
 }