Revert of Mojo: Armed Watchers

content/child/web_data_consumer_handle_impl.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 "content/child/web_data_consumer_handle_impl.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 19 matching lines @@
   friend class base::RefCountedThreadSafe<Context>;
   ~Context() {}
   Handle handle_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 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();
 }
 
 WebDataConsumerHandleImpl::ReaderImpl::~ReaderImpl() {
 }
 
 Result WebDataConsumerHandleImpl::ReaderImpl::read(void* data,
                                                    size_t size,
                                                    Flags flags,
@@ skipping 72 matching lines @@
     case MOJO_RESULT_SHOULD_WAIT:
       return ShouldWait;
     case MOJO_RESULT_RESOURCE_EXHAUSTED:
       return ResourceExhausted;
     default:
       return UnexpectedError;
   }
 }
 
 void WebDataConsumerHandleImpl::ReaderImpl::StartWatching() {
-  handle_watcher_.Watch(
+  handle_watcher_.Start(
       context_->handle().get(), MOJO_HANDLE_SIGNAL_READABLE,
       base::Bind(&ReaderImpl::OnHandleGotReadable, base::Unretained(this)));
 }
 
 void WebDataConsumerHandleImpl::ReaderImpl::OnHandleGotReadable(MojoResult) {
   DCHECK(client_);
   client_->didGetReadable();
 }
 
 WebDataConsumerHandleImpl::WebDataConsumerHandleImpl(Handle handle)
     : context_(new Context(std::move(handle))) {}
 
 WebDataConsumerHandleImpl::~WebDataConsumerHandleImpl() {
 }
 
 std::unique_ptr<blink::WebDataConsumerHandle::Reader>
 WebDataConsumerHandleImpl::obtainReader(Client* client) {
   return base::WrapUnique(new ReaderImpl(context_, client));
 }
 
 const char* WebDataConsumerHandleImpl::debugName() const {
   return "WebDataConsumerHandleImpl";
 }
 
 }  // namespace content