Index: dbus/end_to_end_async_unittest.cc |
=================================================================== |
--- dbus/end_to_end_async_unittest.cc (revision 183314) |
+++ dbus/end_to_end_async_unittest.cc (working copy) |
@@ -46,7 +46,7 @@ |
// Start the test service, using the D-Bus thread. |
dbus::TestService::Options options; |
- options.dbus_thread_message_loop_proxy = dbus_thread_->message_loop_proxy(); |
+ options.dbus_task_runner = dbus_thread_->message_loop_proxy(); |
test_service_.reset(new dbus::TestService(options)); |
ASSERT_TRUE(test_service_->StartService()); |
ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted()); |
@@ -56,8 +56,7 @@ |
dbus::Bus::Options bus_options; |
bus_options.bus_type = dbus::Bus::SESSION; |
bus_options.connection_type = dbus::Bus::PRIVATE; |
- bus_options.dbus_thread_message_loop_proxy = |
- dbus_thread_->message_loop_proxy(); |
+ bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy(); |
bus_options.disconnected_callback = |
base::Bind(&EndToEndAsyncTest::OnDisconnected, base::Unretained(this)); |
bus_ = new dbus::Bus(bus_options); |
@@ -138,8 +137,7 @@ |
bus_options.bus_type = dbus::Bus::CUSTOM_ADDRESS; |
bus_options.address = kInvalidAddress; |
bus_options.connection_type = dbus::Bus::PRIVATE; |
- bus_options.dbus_thread_message_loop_proxy = |
- dbus_thread_->message_loop_proxy(); |
+ bus_options.dbus_task_runner = dbus_thread_->message_loop_proxy(); |
bus_ = new dbus::Bus(bus_options); |
ASSERT_TRUE(bus_->HasDBusThread()); |