diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 01:36:53 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 01:36:53 +0000 |
| commit | 200328ab0dcebf5869a63fb891a58c3e39768b12 (patch) | |
| tree | 16325243683583f306a51c05ca0c44518b4af1b2 /dbus/end_to_end_async_unittest.cc | |
| parent | 044512594122e2feb1fb78bd96b59a300c98a253 (diff) | |
| download | chromium_src-200328ab0dcebf5869a63fb891a58c3e39768b12.zip chromium_src-200328ab0dcebf5869a63fb891a58c3e39768b12.tar.gz chromium_src-200328ab0dcebf5869a63fb891a58c3e39768b12.tar.bz2 | |
DBus: Use TaskRunners instead of MessageLoopProxies.
Review URL: https://chromiumcodereview.appspot.com/12255043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/end_to_end_async_unittest.cc')
| -rw-r--r-- | dbus/end_to_end_async_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dbus/end_to_end_async_unittest.cc b/dbus/end_to_end_async_unittest.cc index b91ea77..0a3446e 100644 --- a/dbus/end_to_end_async_unittest.cc +++ b/dbus/end_to_end_async_unittest.cc @@ -46,7 +46,7 @@ class EndToEndAsyncTest : public testing::Test { // 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 @@ class EndToEndAsyncTest : public testing::Test { 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 @@ class EndToEndAsyncTest : public testing::Test { 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()); |