| Index: chromeos/dbus/mock_dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/mock_dbus_thread_manager.cc b/chromeos/dbus/mock_dbus_thread_manager.cc
|
| index 5c6584a6981cf779d2fc2b2c23c53f5ec8b19221..be752b4700b0e3d0d07332db5d7687ddd85b1011 100644
|
| --- a/chromeos/dbus/mock_dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/mock_dbus_thread_manager.cc
|
| @@ -19,7 +19,6 @@
|
| #include "chromeos/dbus/mock_bluetooth_out_of_band_client.h"
|
| #include "chromeos/dbus/mock_cros_disks_client.h"
|
| #include "chromeos/dbus/mock_cryptohome_client.h"
|
| -#include "chromeos/dbus/mock_debug_daemon_client.h"
|
| #include "chromeos/dbus/mock_shill_device_client.h"
|
| #include "chromeos/dbus/mock_shill_ipconfig_client.h"
|
| #include "chromeos/dbus/mock_shill_manager_client.h"
|
| @@ -27,12 +26,8 @@
|
| #include "chromeos/dbus/mock_shill_service_client.h"
|
| #include "chromeos/dbus/mock_gsm_sms_client.h"
|
| #include "chromeos/dbus/mock_image_burner_client.h"
|
| -#include "chromeos/dbus/mock_introspectable_client.h"
|
| -#include "chromeos/dbus/mock_modem_messaging_client.h"
|
| -#include "chromeos/dbus/mock_permission_broker_client.h"
|
| #include "chromeos/dbus/mock_power_manager_client.h"
|
| #include "chromeos/dbus/mock_session_manager_client.h"
|
| -#include "chromeos/dbus/mock_sms_client.h"
|
| #include "chromeos/dbus/mock_system_clock_client.h"
|
| #include "chromeos/dbus/mock_update_engine_client.h"
|
| #include "chromeos/dbus/power_policy_controller.h"
|
| @@ -53,7 +48,6 @@ MockDBusThreadManager::MockDBusThreadManager()
|
| mock_bluetooth_out_of_band_client_(new MockBluetoothOutOfBandClient),
|
| mock_cros_disks_client_(new MockCrosDisksClient),
|
| mock_cryptohome_client_(new MockCryptohomeClient),
|
| - mock_debugdaemon_client_(new MockDebugDaemonClient),
|
| mock_shill_device_client_(new MockShillDeviceClient),
|
| mock_shill_ipconfig_client_(new MockShillIPConfigClient),
|
| mock_shill_manager_client_(new MockShillManagerClient),
|
| @@ -61,12 +55,8 @@ MockDBusThreadManager::MockDBusThreadManager()
|
| mock_shill_service_client_(new MockShillServiceClient),
|
| mock_gsm_sms_client_(new MockGsmSMSClient),
|
| mock_image_burner_client_(new MockImageBurnerClient),
|
| - mock_introspectable_client_(new MockIntrospectableClient),
|
| - mock_modem_messaging_client_(new MockModemMessagingClient),
|
| - mock_permission_broker_client_(new MockPermissionBrokerClient),
|
| mock_power_manager_client_(new MockPowerManagerClient),
|
| mock_session_manager_client_(new MockSessionManagerClient),
|
| - mock_sms_client_(new MockSMSClient),
|
| mock_system_clock_client_(new MockSystemClockClient),
|
| mock_update_engine_client_(new MockUpdateEngineClient),
|
| mock_ibus_client_(new MockIBusClient),
|
| @@ -91,8 +81,6 @@ MockDBusThreadManager::MockDBusThreadManager()
|
| .WillRepeatedly(Return(mock_cros_disks_client()));
|
| EXPECT_CALL(*this, GetCryptohomeClient())
|
| .WillRepeatedly(Return(mock_cryptohome_client()));
|
| - EXPECT_CALL(*this, GetDebugDaemonClient())
|
| - .WillRepeatedly(Return(mock_debugdaemon_client()));
|
| EXPECT_CALL(*this, GetShillDeviceClient())
|
| .WillRepeatedly(Return(mock_shill_device_client()));
|
| EXPECT_CALL(*this, GetShillIPConfigClient())
|
| @@ -107,16 +95,10 @@ MockDBusThreadManager::MockDBusThreadManager()
|
| .WillRepeatedly(Return(mock_gsm_sms_client()));
|
| EXPECT_CALL(*this, GetImageBurnerClient())
|
| .WillRepeatedly(Return(mock_image_burner_client()));
|
| - EXPECT_CALL(*this, GetIntrospectableClient())
|
| - .WillRepeatedly(Return(mock_introspectable_client()));
|
| - EXPECT_CALL(*this, GetModemMessagingClient())
|
| - .WillRepeatedly(Return(mock_modem_messaging_client()));
|
| EXPECT_CALL(*this, GetPowerManagerClient())
|
| .WillRepeatedly(Return(mock_power_manager_client_.get()));
|
| EXPECT_CALL(*this, GetSessionManagerClient())
|
| .WillRepeatedly(Return(mock_session_manager_client_.get()));
|
| - EXPECT_CALL(*this, GetSMSClient())
|
| - .WillRepeatedly(Return(mock_sms_client_.get()));
|
| EXPECT_CALL(*this, GetSystemClockClient())
|
| .WillRepeatedly(Return(mock_system_clock_client()));
|
| EXPECT_CALL(*this, GetUpdateEngineClient())
|
|
|