Use FileDescriptorWatcher in BrlapiConnectionImpl.

chrome/browser/extensions/api/braille_display_private/brlapi_connection.cc

 // Copyright 2013 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/braille_display_private/brlapi_connection.h"
 
 #include <errno.h>
 
+#include "base/files/file_descriptor_watcher_posix.h"
 #include "base/macros.h"
 #include "base/memory/free_deleter.h"
-#include "base/message_loop/message_loop.h"
 #include "base/sys_info.h"
 #include "build/build_config.h"
 
 namespace extensions {
-using base::MessageLoopForIO;
 namespace api {
 namespace braille_display_private {
 
 namespace {
 // Default virtual terminal.  This can be overriden by setting the
 // WINDOWPATH environment variable.  This is only used when not running
 // under Crhome OS (that is in aura for a Linux desktop).
 // TODO(plundblad): Find a way to detect the controlling terminal of the
 // X server.
 static const int kDefaultTtyLinux = 7;
 #if defined(OS_CHROMEOS)
 // The GUI is always running on vt1 in Chrome OS.
 static const int kDefaultTtyChromeOS = 1;
 #endif
 }  // namespace
 
-class BrlapiConnectionImpl : public BrlapiConnection,
-                             MessageLoopForIO::Watcher {
+class BrlapiConnectionImpl : public BrlapiConnection {
  public:
   explicit BrlapiConnectionImpl(LibBrlapiLoader* loader) :
       libbrlapi_loader_(loader) {}
 
   ~BrlapiConnectionImpl() override { Disconnect(); }
 
   ConnectResult Connect(const OnDataReadyCallback& on_data_ready) override;
   void Disconnect() override;
   bool Connected() override { return handle_ != nullptr; }
   brlapi_error_t* BrlapiError() override;
   std::string BrlapiStrError() override;
   bool GetDisplaySize(size_t* size) override;
   bool WriteDots(const unsigned char* cells) override;
   int ReadKey(brlapi_keyCode_t* keyCode) override;
 
-  // MessageLoopForIO::Watcher
-  void OnFileCanReadWithoutBlocking(int fd) override { on_data_ready_.Run(); }
-
-  void OnFileCanWriteWithoutBlocking(int fd) override {}
-
  private:
   bool CheckConnected();
   ConnectResult ConnectResultForError();
 
   LibBrlapiLoader* libbrlapi_loader_;
   std::unique_ptr<brlapi_handle_t, base::FreeDeleter> handle_;
-  MessageLoopForIO::FileDescriptorWatcher fd_controller_;
-  OnDataReadyCallback on_data_ready_;
+  std::unique_ptr<base::FileDescriptorWatcher::Controller> fd_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(BrlapiConnectionImpl);
 };
 
 BrlapiConnection::BrlapiConnection() {
 }
 
 BrlapiConnection::~BrlapiConnection() {
 }
 
@@ skipping 52 matching lines @@
       BRLAPI_KEY_TYPE_CMD | BRLAPI_KEY_CMD_PASSDOTS,
   };
   if (libbrlapi_loader_->brlapi__acceptKeys(
           handle_.get(), brlapi_rangeType_command, extraKeys,
           arraysize(extraKeys)) < 0) {
     LOG(ERROR) << "Couldn't acceptKeys: " << BrlapiStrError();
     Disconnect();
     return CONNECT_ERROR_RETRY;
   }
 
-  if (!MessageLoopForIO::current()->WatchFileDescriptor(
-          fd, true, MessageLoopForIO::WATCH_READ, &fd_controller_, this)) {
-    LOG(ERROR) << "Couldn't watch file descriptor " << fd;
-    Disconnect();
-    return CONNECT_ERROR_RETRY;
-  }
-
-  on_data_ready_ = on_data_ready;
+  fd_controller_ =
+      base::FileDescriptorWatcher::WatchReadable(fd, on_data_ready);
 
   return CONNECT_SUCCESS;
 }
 
 void BrlapiConnectionImpl::Disconnect() {
   if (!handle_) {
     return;
   }
-  fd_controller_.StopWatchingFileDescriptor();
+  fd_controller_.reset();
   libbrlapi_loader_->brlapi__closeConnection(
       handle_.get());
   handle_.reset();
 }
 
 brlapi_error_t* BrlapiConnectionImpl::BrlapiError() {
   return libbrlapi_loader_->brlapi_error_location();
 }
 
 std::string BrlapiConnectionImpl::BrlapiStrError() {
@@ skipping 48 matching lines @@
   if (error->brlerrno == BRLAPI_ERROR_LIBCERR
       && error->libcerrno == ENOENT) {
     return CONNECT_ERROR_NO_RETRY;
   }
   return CONNECT_ERROR_RETRY;
 }
 
 }  // namespace braille_display_private
 }  // namespace api
 }  // namespace extensions