Use FileDescriptorWatcher in tap_proxy.cc.

media/cast/test/utility/tap_proxy.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 <errno.h>
 #include <fcntl.h>
 #include <linux/if_tun.h>
 #include <linux/types.h>
 #include <math.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <deque>
 #include <map>
+#include <memory>
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/files/file_descriptor_watcher_posix.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/default_tick_clock.h"
 #include "media/cast/test/utility/udp_proxy.h"
 #include "net/base/io_buffer.h"
@@ skipping 25 matching lines @@
         fprintf(stderr, "Truncated write!\n");
         exit(1);
       }
       break;
     }
   }
  private:
   int fd_;
 };
 
-class QueueManager : public base::MessageLoopForIO::Watcher {
+class QueueManager {
  public:
   QueueManager(int input_fd, int output_fd, std::unique_ptr<PacketPipe> pipe)
       : input_fd_(input_fd), packet_pipe_(std::move(pipe)) {
-    CHECK(base::MessageLoopForIO::current()->WatchFileDescriptor(
-        input_fd_, true, base::MessageLoopForIO::WATCH_READ,
-        &read_socket_watcher_, this));
+    read_socket_watch_controller_ = base::FileDescriptorWatcher::WatchReadable(
+        input_fd_, base::Bind(&QueueManager::OnFileCanReadWithoutBlocking,
+                              base::Unretained(this)));
 
     std::unique_ptr<PacketPipe> tmp(new SendToFDPipe(output_fd));
     if (packet_pipe_) {
       packet_pipe_->AppendToPipe(std::move(tmp));
     } else {
       packet_pipe_ = std::move(tmp);
     }
     packet_pipe_->InitOnIOThread(base::ThreadTaskRunnerHandle::Get(),
                                  &tick_clock_);
   }
 
-  ~QueueManager() final {}
-
-  // MessageLoopForIO::Watcher methods
-  void OnFileCanReadWithoutBlocking(int fd) final {
+ private:
+  void OnFileCanReadWithoutBlocking() {
     std::unique_ptr<Packet> packet(new Packet(kMaxPacketSize));
     int nread = read(input_fd_,
                      reinterpret_cast<char*>(&packet->front()),
                      kMaxPacketSize);
     if (nread < 0) {
       if (errno == EINTR) return;
       perror("read");
       exit(1);
     }
     if (nread == 0) return;
     packet->resize(nread);
     packet_pipe_->Send(std::move(packet));
   }
-  void OnFileCanWriteWithoutBlocking(int fd) final { NOTREACHED(); }
 
- private:
   int input_fd_;
   std::unique_ptr<PacketPipe> packet_pipe_;
-  base::MessageLoopForIO::FileDescriptorWatcher read_socket_watcher_;
+  std::unique_ptr<base::FileDescriptorWatcher::Controller>
+      read_socket_watch_controller_;
   base::DefaultTickClock tick_clock_;
 };
 
 }  // namespace test
 }  // namespace cast
 }  // namespace media
 
 base::TimeTicks last_printout;
 
 class ByteCounter {
@@ skipping 176 matching lines @@
   }
 
   SetupByteCounters(&in_pipe, &in_pipe_input_counter, &in_pipe_output_counter);
   SetupByteCounters(
       &out_pipe, &out_pipe_input_counter, &out_pipe_output_counter);
 
   int fd1 = tun_alloc(argv[1], IFF_TAP);
   int fd2 = tun_alloc(argv[2], IFF_TAP);
 
   base::MessageLoopForIO message_loop;
+  base::FileDescriptorWatcher file_descriptor_watcher(&message_loop);
   last_printout = base::TimeTicks::Now();
   media::cast::test::QueueManager qm1(fd1, fd2, std::move(in_pipe));
   media::cast::test::QueueManager qm2(fd2, fd1, std::move(out_pipe));
   CheckByteCounters();
   printf("Press Ctrl-C when done.\n");
   base::RunLoop().Run();
 }