Migrate to base::FileDescriptionWatcher in dbus/bus.cc.

dbus/object_proxy_unittest.cc

Index: dbus/object_proxy_unittest.cc
diff --git a/dbus/object_proxy_unittest.cc b/dbus/object_proxy_unittest.cc
index 189ef9074a02da81e727aefae08b4458e44200ab..5dbfaac03fe1c2902e01c4a6be5c8e78eeebf827 100644
--- a/dbus/object_proxy_unittest.cc
+++ b/dbus/object_proxy_unittest.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "dbus/object_proxy.h"
 #include "base/bind.h"
+#include "base/files/file_descriptor_watcher_posix.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "dbus/bus.h"
-#include "dbus/object_proxy.h"
 #include "dbus/test_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -15,6 +16,8 @@ namespace {
 
 class ObjectProxyTest : public testing::Test {
  protected:
+  ObjectProxyTest() : file_descriptor_watcher_(&message_loop_) {}
+
   void SetUp() override {
     Bus::Options bus_options;
     bus_options.bus_type = Bus::SESSION;
@@ -25,6 +28,10 @@ class ObjectProxyTest : public testing::Test {
   void TearDown() override { bus_->ShutdownAndBlock(); }
 
   base::MessageLoopForIO message_loop_;
+
+  // Enable FileDescriptorWatcher. Needed dbus::Watch.

[Daniel Erat, 2017/04/11 16:36:19]

nit: "Needed by ..."? i don't understand the "Enable" part of this either; maybe
just delete it?

[fdoray, 2017/04/11 16:52:02]

Done.

You can't call FileDescriptorWatcher::WatchReadable/Writable outside the scope
of a FileDescriptorWatcher. This is documented here
https://cs.chromium.org/chromium/src/base/files/file_descriptor_watcher_posix...

+  base::FileDescriptorWatcher file_descriptor_watcher_;
+
   scoped_refptr<Bus> bus_;
 };