DBus: Use TaskRunners instead of MessageLoopProxies.

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/message_loop.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
@@ skipping 79 matching lines @@
   MessageLoop message_loop;
 
   // Start the D-Bus thread.
   base::Thread::Options thread_options;
   thread_options.message_loop_type = MessageLoop::TYPE_IO;
   base::Thread dbus_thread("D-Bus thread");
   dbus_thread.StartWithOptions(thread_options);
 
   // Create the bus.
   dbus::Bus::Options options;
-  options.dbus_thread_message_loop_proxy = dbus_thread.message_loop_proxy();
+  options.dbus_task_runner = dbus_thread.message_loop_proxy();
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
   ASSERT_FALSE(bus->shutdown_completed());
 
   // Try to remove a non existant object proxy should return false.
   ASSERT_FALSE(
       bus->RemoveObjectProxy("org.chromium.TestService",
                              dbus::ObjectPath("/org/chromium/TestObject"),
                              base::Bind(&base::DoNothing)));
 
   dbus::ObjectProxy* object_proxy1 =
@@ skipping 59 matching lines @@
 
 TEST(BusTest, UnregisterExportedObject) {
   // Start the D-Bus thread.
   base::Thread::Options thread_options;
   thread_options.message_loop_type = MessageLoop::TYPE_IO;
   base::Thread dbus_thread("D-Bus thread");
   dbus_thread.StartWithOptions(thread_options);
 
   // Create the bus.
   dbus::Bus::Options options;
-  options.dbus_thread_message_loop_proxy = dbus_thread.message_loop_proxy();
+  options.dbus_task_runner = dbus_thread.message_loop_proxy();
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
   ASSERT_FALSE(bus->shutdown_completed());
 
   dbus::ExportedObject* object_proxy1 =
       bus->GetExportedObject(dbus::ObjectPath("/org/chromium/TestObject"));
   ASSERT_TRUE(object_proxy1);
 
   // Increment the reference count to the object proxy to avoid destroying it
   // calling UnregisterExportedObject. This ensures the dbus::ExportedObject is
   // not freed from memory. See http://crbug.com/137846 for details.
@@ skipping 29 matching lines @@
 
 TEST(BusTest, ShutdownAndBlockWithDBusThread) {
   // Start the D-Bus thread.
   base::Thread::Options thread_options;
   thread_options.message_loop_type = MessageLoop::TYPE_IO;
   base::Thread dbus_thread("D-Bus thread");
   dbus_thread.StartWithOptions(thread_options);
 
   // Create the bus.
   dbus::Bus::Options options;
-  options.dbus_thread_message_loop_proxy = dbus_thread.message_loop_proxy();
+  options.dbus_task_runner = dbus_thread.message_loop_proxy();
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
   ASSERT_FALSE(bus->shutdown_completed());
 
   // Shut down synchronously.
   bus->ShutdownOnDBusThreadAndBlock();
   EXPECT_TRUE(bus->shutdown_completed());
   dbus_thread.Stop();
 }
 
 TEST(BusTest, AddFilterFunction) {
@@ skipping 48 matching lines @@
       error.get()));
   ASSERT_FALSE(error.is_set());
 
   // 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();
 }