diff options
| author | haruki@chromium.org <haruki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 07:30:59 +0000 |
|---|---|---|
| committer | haruki@chromium.org <haruki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 07:30:59 +0000 |
| commit | 9cf45f5176cdda3b5f9d5cdd26cb9ac5d1901515 (patch) | |
| tree | e450d93cc2f99748d73fca828493e43f45196c20 /chromeos | |
| parent | 30551e71ac3439ef7a1a7c19ee3be0982ab81416 (diff) | |
| download | chromium_src-9cf45f5176cdda3b5f9d5cdd26cb9ac5d1901515.zip chromium_src-9cf45f5176cdda3b5f9d5cdd26cb9ac5d1901515.tar.gz chromium_src-9cf45f5176cdda3b5f9d5cdd26cb9ac5d1901515.tar.bz2 | |
dbus: Add FakeBus
BUG=234078
TEST=trybots
Review URL: https://chromiumcodereview.appspot.com/14493004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos.gyp | 1 | ||||
| -rw-r--r-- | chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 4f61736..11c42c0 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -378,6 +378,7 @@ 'type': 'static_library', 'dependencies': [ '../build/linux/system.gyp:dbus', + '../dbus/dbus.gyp:dbus_test_support', 'chromeos', 'power_manager_proto', ], diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc index 2d36b8f..784b6f4 100644 --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc +++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc @@ -17,6 +17,7 @@ #include "chromeos/dbus/ibus/mock_ibus_engine_service.h" #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h" #include "chromeos/dbus/ibus/mock_ibus_panel_service.h" +#include "dbus/fake_bus.h" namespace chromeos { @@ -53,8 +54,8 @@ void MockDBusThreadManagerWithoutGMock::RemoveObserver( void MockDBusThreadManagerWithoutGMock::InitIBusBus( const std::string& ibus_address, const base::Closure& closure) { - // Non-null bus address is used to ensure the connection to ibus-daemon. - ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef); + dbus::Bus::Options options; + ibus_bus_ = new dbus::FakeBus(options); } dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() { |