diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 20:23:48 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 20:23:48 +0000 |
| commit | 2170b864600ad6902296a93de178f6b03f4cbb5e (patch) | |
| tree | 909ef81ea3f8898a96354dd474fe2d768f461693 /chromeos/dbus | |
| parent | b0dbab14766013fffe1fc9dd2c004f60bb26305c (diff) | |
| download | chromium_src-2170b864600ad6902296a93de178f6b03f4cbb5e.zip chromium_src-2170b864600ad6902296a93de178f6b03f4cbb5e.tar.gz chromium_src-2170b864600ad6902296a93de178f6b03f4cbb5e.tar.bz2 | |
Add unit tests for ibus-daemon connection and component extension ime initialization.
With this change, ui_unittests is also need update.
We can't call or even check the call count of IBusClient/IBUsInputContextClient stuff before InitIBusBus.
BUG=None
TEST=ran unit_tests both Release/Debug configuration.
Review URL: https://chromiumcodereview.appspot.com/14845003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus')
| -rw-r--r-- | chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc index 4658db9..96e5609 100644 --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc +++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc @@ -52,12 +52,6 @@ MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock() fake_old_bluetooth_manager_client_(new FakeOldBluetoothManagerClient), fake_old_bluetooth_adapter_client_(new FakeOldBluetoothAdapterClient), fake_old_bluetooth_device_client_(new FakeOldBluetoothDeviceClient), - mock_ibus_client_(new MockIBusClient), - mock_ibus_config_client_(new MockIBusConfigClient), - mock_ibus_input_context_client_(new MockIBusInputContextClient), - mock_ibus_engine_service_(new MockIBusEngineService), - mock_ibus_engine_factory_service_(new MockIBusEngineFactoryService), - mock_ibus_panel_service_(new MockIBusPanelService), ibus_bus_(NULL) { power_policy_controller_.reset( new PowerPolicyController(this, fake_power_manager_client_.get())); @@ -85,6 +79,12 @@ void MockDBusThreadManagerWithoutGMock::InitIBusBus( const base::Closure& closure) { // Non-null bus address is used to ensure the connection to ibus-daemon. ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef); + mock_ibus_client_.reset(new MockIBusClient); + mock_ibus_config_client_.reset(new MockIBusConfigClient); + mock_ibus_input_context_client_.reset(new MockIBusInputContextClient); + mock_ibus_engine_service_.reset(new MockIBusEngineService); + mock_ibus_engine_factory_service_.reset(new MockIBusEngineFactoryService); + mock_ibus_panel_service_.reset(new MockIBusPanelService); } dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() { @@ -181,7 +181,7 @@ ShillIPConfigClient* ShillManagerClient* MockDBusThreadManagerWithoutGMock::GetShillManagerClient() { - return fake_shill_manager_client_.get();; + return fake_shill_manager_client_.get(); } ShillProfileClient* |