diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 20:03:24 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 20:03:24 +0000 |
| commit | 56d82c9cc1ac26ded882c9b46694a8ea5142fdf5 (patch) | |
| tree | e8ea07b1e72fcd78e7e1df3ec0b2febd131ea926 /dbus/end_to_end_async_unittest.cc | |
| parent | b054193d71840378f471d8ba4819ef7487eac0b9 (diff) | |
| download | chromium_src-56d82c9cc1ac26ded882c9b46694a8ea5142fdf5.zip chromium_src-56d82c9cc1ac26ded882c9b46694a8ea5142fdf5.tar.gz chromium_src-56d82c9cc1ac26ded882c9b46694a8ea5142fdf5.tar.bz2 | |
Linux: use MessageLoopProxy instead of base::Thread in our DBus client library.
This allows us to use BrowserThread::GetMessageLoopProxyForThread() to specify the DBus thread.
Also do a little bit of unrelated comment cleanup.
BUG=90036
Review URL: http://codereview.chromium.org/7800023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99794 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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dbus/end_to_end_async_unittest.cc b/dbus/end_to_end_async_unittest.cc index cea37a8..f04f9a7 100644 --- a/dbus/end_to_end_async_unittest.cc +++ b/dbus/end_to_end_async_unittest.cc @@ -37,7 +37,7 @@ class EndToEndAsyncTest : public testing::Test { // Start the test service, using the D-Bus thread. dbus::TestService::Options options; - options.dbus_thread = dbus_thread_.get(); + options.dbus_thread_message_loop_proxy = dbus_thread_->message_loop_proxy(); test_service_.reset(new dbus::TestService(options)); ASSERT_TRUE(test_service_->StartService()); ASSERT_TRUE(test_service_->WaitUntilServiceIsStarted()); @@ -47,7 +47,8 @@ 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 = dbus_thread_.get(); + bus_options.dbus_thread_message_loop_proxy = + dbus_thread_->message_loop_proxy(); bus_ = new dbus::Bus(bus_options); object_proxy_ = bus_->GetObjectProxy("org.chromium.TestService", "/org/chromium/TestObject"); |