Revert of Mojo: Armed Watchers

ios/web/webui/mojo_facade.mm

 // Copyright 2016 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.
 
 #import "ios/web/webui/mojo_facade.h"
 
 #include <utility>
 
 #import <Foundation/Foundation.h>
 
@@ skipping 234 matching lines @@
 
 std::unique_ptr<base::Value> MojoFacade::HandleSupportWatch(
     const base::DictionaryValue* args) {
   int handle = 0;
   CHECK(args->GetInteger("handle", &handle));
   int signals = 0;
   CHECK(args->GetInteger("signals", &signals));
   int callback_id;
   CHECK(args->GetInteger("callbackId", &callback_id));
 
-  mojo::SimpleWatcher::ReadyCallback callback = base::BindBlockArc(^(
+  mojo::Watcher::ReadyCallback callback = base::BindBlockArc(^(
       MojoResult result) {
     NSString* script =
         [NSString stringWithFormat:@"__crWeb.mojo.signalWatch(%d, %d)",
                                    callback_id, result];
     [script_evaluator_ executeJavaScript:script completionHandler:nil];
   });
-  mojo::SimpleWatcher* watcher = new mojo::SimpleWatcher(
-      FROM_HERE, mojo::SimpleWatcher::ArmingPolicy::AUTOMATIC);
+  mojo::Watcher* watcher = new mojo::Watcher(FROM_HERE);
   watchers_.insert(std::make_pair(++last_watch_id_, base::WrapUnique(watcher)));
-  watcher->Watch(static_cast<mojo::Handle>(handle), signals, callback);
+  watcher->Start(static_cast<mojo::Handle>(handle), signals, callback);
   return ValueFromInteger(last_watch_id_);
 }
 
 std::unique_ptr<base::Value> MojoFacade::HandleSupportCancelWatch(
     const base::DictionaryValue* args) {
   int watch_id = 0;
   CHECK(args->GetInteger("watchId", &watch_id));
   watchers_.erase(watch_id);
   return nullptr;
 }
 
 }  // namespace web