Use FileDescriptorWatcher in NativeMessageProcessHost.

chrome/browser/extensions/api/messaging/native_message_process_host.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/api/messaging/native_message_process_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 181 matching lines @@
       FROM_HERE,
       base::Bind(&NativeMessageProcessHost::LaunchHostProcess,
                  weak_factory_.GetWeakPtr()));
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 NativeMessageProcessHost::task_runner() const {
   return task_runner_;
 }
 
-#if defined(OS_POSIX)
-void NativeMessageProcessHost::OnFileCanReadWithoutBlocking(int fd) {
-  DCHECK_EQ(fd, read_file_);
-  DoRead();
-}
-
-void NativeMessageProcessHost::OnFileCanWriteWithoutBlocking(int fd) {
-  NOTREACHED();
-}
-#endif  // !defined(OS_POSIX)
-
 void NativeMessageProcessHost::ReadNowForTesting() {
   DoRead();
 }
 
 void NativeMessageProcessHost::WaitRead() {
   if (closed_)
     return;
 
   DCHECK(!read_pending_);
 
   // On POSIX FileStream::Read() uses blocking thread pool, so it's better to
   // wait for the file to become readable before calling DoRead(). Otherwise it
   // would always be consuming one thread in the thread pool. On Windows
   // FileStream uses overlapped IO, so that optimization isn't necessary there.
 #if defined(OS_POSIX)
-  base::MessageLoopForIO::current()->WatchFileDescriptor(
-    read_file_, false /* persistent */,
-    base::MessageLoopForIO::WATCH_READ, &read_watcher_, this);
+  read_controller_ = base::FileDescriptorWatcher::WatchReadable(
+      read_file_,
+      base::Bind(&NativeMessageProcessHost::DoRead, base::Unretained(this)));
 #else  // defined(OS_POSIX)
   DoRead();
 #endif  // defined(!OS_POSIX)
 }
 
 void NativeMessageProcessHost::DoRead() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
+#if defined(OS_POSIX)
+  read_controller_.reset();
+#endif
+
   while (!closed_ && !read_pending_) {
     read_buffer_ = new net::IOBuffer(kReadBufferSize);
     int result =
         read_stream_->Read(read_buffer_.get(), kReadBufferSize,
                            base::Bind(&NativeMessageProcessHost::OnRead,
                                       weak_factory_.GetWeakPtr()));
     HandleReadResult(result);
   }
 }
 
@@ skipping 109 matching lines @@
 
   if (!closed_) {
     closed_ = true;
     read_stream_.reset();
     write_stream_.reset();
     client_->CloseChannel(error_message);
   }
 }
 
 }  // namespace extensions