Mojo: Armed Watchers

mojo/edk/js/waiting_callback.cc

 // Copyright 2014 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/edk/js/waiting_callback.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "gin/per_context_data.h"
 
@@ skipping 14 matching lines @@
 
 // static
 gin::Handle<WaitingCallback> WaitingCallback::Create(
     v8::Isolate* isolate,
     v8::Handle<v8::Function> callback,
     gin::Handle<HandleWrapper> handle_wrapper,
     MojoHandleSignals signals,
     bool one_shot) {
   gin::Handle<WaitingCallback> waiting_callback = gin::CreateHandle(
       isolate, new WaitingCallback(isolate, callback, one_shot));
-  MojoResult result = waiting_callback->watcher_.Start(
+  MojoResult result = waiting_callback->watcher_.Watch(
       handle_wrapper->get(), signals,
       base::Bind(&WaitingCallback::OnHandleReady,
                  base::Unretained(waiting_callback.get())));
 
   // The signals may already be unsatisfiable.
   if (result == MOJO_RESULT_FAILED_PRECONDITION)
     waiting_callback->OnHandleReady(MOJO_RESULT_FAILED_PRECONDITION);
 
   return waiting_callback;
 }
 
 void WaitingCallback::Cancel() {
   if (watcher_.IsWatching())
     watcher_.Cancel();
 }
 
 WaitingCallback::WaitingCallback(v8::Isolate* isolate,
                                  v8::Handle<v8::Function> callback,
                                  bool one_shot)
     : one_shot_(one_shot),
-      watcher_(FROM_HERE),
+      watcher_(FROM_HERE, SimpleWatcher::ArmingPolicy::AUTOMATIC),
       weak_factory_(this) {
   v8::Handle<v8::Context> context = isolate->GetCurrentContext();
   runner_ = gin::PerContextData::From(context)->runner()->GetWeakPtr();
   GetWrapper(isolate)
       ->SetPrivate(context, GetHiddenPropertyName(isolate), callback)
       .FromJust();
 }
 
 WaitingCallback::~WaitingCallback() {
   Cancel();
@@ skipping 19 matching lines @@
 
   if (one_shot_ || result == MOJO_RESULT_CANCELLED) {
     runner_.reset();
     Cancel();
   }
 }
 
 }  // namespace js
 }  // namespace edk
 }  // namespace mojo