diff options
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, 2 insertions, 4 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 82d505e..ce3753f 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -378,7 +378,6 @@ '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 1e0e37e..1cc24cc 100644 --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc +++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc @@ -19,7 +19,6 @@ #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 { @@ -62,8 +61,8 @@ void MockDBusThreadManagerWithoutGMock::RemoveObserver( void MockDBusThreadManagerWithoutGMock::InitIBusBus( const std::string& ibus_address, const base::Closure& closure) { - dbus::Bus::Options options; - ibus_bus_ = new dbus::FakeBus(options); + // Non-null bus address is used to ensure the connection to ibus-daemon. + ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef); } dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() { |