| Index: chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
|
| diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
|
| index f5c5841f5396d9a203f0c2a590c0259cc775450a..a68ae04e292fe614a0215a0848d5c6ed0b990816 100644
|
| --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
|
| +++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
|
| @@ -38,7 +38,6 @@ class MockIBusClient;
|
| class MockIBusEngineFactoryService;
|
| class MockIBusEngineService;
|
| class MockIBusInputContextClient;
|
| -class MockIBusPanelService;
|
|
|
| // This class provides an another mock DBusThreadManager without gmock
|
| // dependency. This class is used for places where GMock is not allowed
|
| @@ -91,7 +90,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
|
| const dbus::ObjectPath& object_path) OVERRIDE;
|
| virtual void RemoveIBusEngineService(
|
| const dbus::ObjectPath& object_path) OVERRIDE;
|
| - virtual IBusPanelService* GetIBusPanelService() OVERRIDE;
|
|
|
| FakeBluetoothAdapterClient* fake_bluetooth_adapter_client() {
|
| return fake_bluetooth_adapter_client_.get();
|
| @@ -169,10 +167,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
|
| return mock_ibus_engine_factory_service_.get();
|
| }
|
|
|
| - MockIBusPanelService* mock_ibus_panel_service() {
|
| - return mock_ibus_panel_service_.get();
|
| - }
|
| -
|
| void set_ibus_bus(dbus::Bus* ibus_bus) {
|
| ibus_bus_ = ibus_bus;
|
| }
|
| @@ -204,7 +198,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
|
| scoped_ptr<MockIBusInputContextClient> mock_ibus_input_context_client_;
|
| scoped_ptr<MockIBusEngineService> mock_ibus_engine_service_;
|
| scoped_ptr<MockIBusEngineFactoryService> mock_ibus_engine_factory_service_;
|
| - scoped_ptr<MockIBusPanelService> mock_ibus_panel_service_;
|
|
|
| scoped_ptr<PowerPolicyController> power_policy_controller_;
|
| dbus::Bus* ibus_bus_;
|
|
|