Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Unified Diff: dbus/end_to_end_async_unittest.cc

Issue 12255043: DBus: Use TaskRunners instead of MessageLoopProxies. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dbus/bus_unittest.cc ('k') | dbus/mock_bus.h » ('j') | dbus/mock_bus.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « dbus/bus_unittest.cc ('k') | dbus/mock_bus.h » ('j') | dbus/mock_bus.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698