Index: dbus/property_unittest.cc |
=================================================================== |
--- dbus/property_unittest.cc (revision 183314) |
+++ dbus/property_unittest.cc (working copy) |
@@ -16,7 +16,6 @@ |
#include "dbus/bus.h" |
#include "dbus/object_path.h" |
#include "dbus/object_proxy.h" |
-#include "dbus/property.h" |
#include "dbus/test_service.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -57,7 +56,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()); |
@@ -67,8 +66,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_ = new dbus::Bus(bus_options); |
object_proxy_ = bus_->GetObjectProxy( |
"org.chromium.TestService", |