diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-26 13:24:57 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-26 13:24:57 +0100 |
| commit | 68043e1e95eeb07d5cae7aca370b26518b0867d6 (patch) | |
| tree | cc6a216bce6aa9319a216327b73a07f49200dab5 /device | |
| parent | cede44592cfb9ec370925d10c2df733349a94a82 (diff) | |
| download | chromium_org-68043e1e95eeb07d5cae7aca370b26518b0867d6.tar.gz | |
Merge from Chromium at DEPS revision 225410
This commit was generated by merge_to_master.py.
Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
Diffstat (limited to 'device')
| -rw-r--r-- | device/media_transfer_protocol/media_transfer_protocol_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc index 9bcf5be28a..6c0210af1e 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc +++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc @@ -69,8 +69,8 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager { mtpd_owner_changed_callback_); #if !defined(OS_CHROMEOS) - session_bus_->PostTaskToDBusThread( - FROM_HERE, base::Bind(&dbus::Bus::ShutdownAndBlock, session_bus_)); + session_bus_->GetDBusTaskRunner()->PostTask( + FROM_HERE, base::Bind(&dbus::Bus::ShutdownAndBlock, session_bus_)); #endif VLOG(1) << "MediaTransferProtocolManager Shutdown completed"; |