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

dbus/bus_unittest.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 "dbus/bus.h"
 
 #include "base/bind.h"
+#include "base/files/file_descriptor_watcher_posix.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "dbus/exported_object.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/scoped_dbus_error.h"
 #include "dbus/test_service.h"
@@ skipping 293 matching lines @@
 
   // A third attemp to remove the same rule should fail.
   ASSERT_FALSE(bus->RemoveMatch(
       "type='signal',interface='org.chromium.TestService',path='/'",
       error.get()));
 
   bus->ShutdownAndBlock();
 }
 
 TEST(BusTest, ListenForServiceOwnerChange) {
-  // Setup the current thread's MessageLoop. Must be of TYPE_IO for the
-  // listeners to work.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
+
+  // This enables FileDescriptorWatcher, which is required by dbus::Watch.
+  base::FileDescriptorWatcher file_descriptor_watcher(&message_loop);
+
   RunLoopWithExpectedCount run_loop_state;
 
   // Create the bus.
   Bus::Options bus_options;
   scoped_refptr<Bus> bus = new Bus(bus_options);
 
   // Add a listener.
   std::string service_owner1;
   int num_of_owner_changes1 = 0;
   Bus::GetServiceOwnerCallback callback1 =
@@ skipping 75 matching lines @@
   // Connection name is not empty after connection is established.
   EXPECT_TRUE(bus->is_connected());
   EXPECT_FALSE(bus->GetConnectionName().empty());
 
   // Shut down synchronously.
   bus->ShutdownAndBlock();
   EXPECT_TRUE(bus->shutdown_completed());
 }
 
 }  // namespace dbus