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

dbus/object_proxy_unittest.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 "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"
 
 namespace dbus {
 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;
     bus_options.connection_type = Bus::PRIVATE;
     bus_ = new Bus(bus_options);
   }
 
   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_;
 };
 
 // Used as a WaitForServiceToBeAvailableCallback.
 void OnServiceIsAvailable(bool* dest_service_is_available,
                           int* num_calls,
                           bool src_service_is_available) {
   *dest_service_is_available = src_service_is_available;
   (*num_calls)++;
 }
@@ skipping 92 matching lines @@
   num_calls_2 = 0;
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, num_calls_1);
   EXPECT_EQ(1, num_calls_2);
   EXPECT_TRUE(service_is_available_1);
   EXPECT_TRUE(service_is_available_2);
 }
 
 }  // namespace
 }  // namespace dbus