| Index: dbus/signal_sender_verification_unittest.cc
|
| ===================================================================
|
| --- dbus/signal_sender_verification_unittest.cc (revision 183314)
|
| +++ dbus/signal_sender_verification_unittest.cc (working copy)
|
| @@ -41,8 +41,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",
|
| @@ -68,7 +67,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());
|
| @@ -87,7 +86,6 @@
|
| if (!on_name_owner_changed_called_)
|
| message_loop_.Run();
|
| ASSERT_FALSE(latest_name_owner_.empty());
|
| -
|
| }
|
|
|
| virtual void TearDown() {
|
| @@ -148,7 +146,6 @@
|
| }
|
|
|
| protected:
|
| -
|
| // Wait for the hey signal to be received.
|
| void WaitForTestSignal() {
|
| // OnTestSignal() will quit the message loop.
|
|
|