Revert of Mojo: Armed Watchers

mojo/android/system/watcher_impl.cc

 // 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.
 
 #include "mojo/android/system/watcher_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "jni/WatcherImpl_jni.h"
 #include "mojo/public/cpp/system/handle.h"
-#include "mojo/public/cpp/system/simple_watcher.h"
+#include "mojo/public/cpp/system/watcher.h"
 
 namespace mojo {
 namespace android {
 
 using base::android::JavaParamRef;
 
 namespace {
 
 class WatcherImpl {
  public:
-  WatcherImpl() : watcher_(FROM_HERE, SimpleWatcher::ArmingPolicy::AUTOMATIC) {}
+  WatcherImpl() : watcher_(FROM_HERE) {}
 
   ~WatcherImpl() = default;
 
   jint Start(JNIEnv* env,
              const JavaParamRef<jobject>& jcaller,
              jint mojo_handle,
              jint signals) {
     java_watcher_.Reset(env, jcaller);
 
     auto ready_callback =
         base::Bind(&WatcherImpl::OnHandleReady, base::Unretained(this));
 
     MojoResult result =
-        watcher_.Watch(mojo::Handle(static_cast<MojoHandle>(mojo_handle)),
+        watcher_.Start(mojo::Handle(static_cast<MojoHandle>(mojo_handle)),
                        static_cast<MojoHandleSignals>(signals), ready_callback);
+
     if (result != MOJO_RESULT_OK)
       java_watcher_.Reset();
 
     return result;
   }
 
   void Cancel() {
     java_watcher_.Reset();
     watcher_.Cancel();
   }
 
  private:
   void OnHandleReady(MojoResult result) {
     DCHECK(!java_watcher_.is_null());
 
     base::android::ScopedJavaGlobalRef<jobject> java_watcher_preserver;
     if (result == MOJO_RESULT_CANCELLED)
       java_watcher_preserver = std::move(java_watcher_);
 
     Java_WatcherImpl_onHandleReady(
         base::android::AttachCurrentThread(),
         java_watcher_.is_null() ? java_watcher_preserver : java_watcher_,
         result);
   }
 
-  SimpleWatcher watcher_;
+  Watcher watcher_;
   base::android::ScopedJavaGlobalRef<jobject> java_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(WatcherImpl);
 };
 
 }  // namespace
 
 static jlong CreateWatcher(JNIEnv* env, const JavaParamRef<jobject>& jcaller) {
   return reinterpret_cast<jlong>(new WatcherImpl);
 }
@@ skipping 18 matching lines @@
                    jlong watcher_ptr) {
   delete reinterpret_cast<WatcherImpl*>(watcher_ptr);
 }
 
 bool RegisterWatcherImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo