Index: chromeos/dbus/dbus_client_bundle.cc |
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc |
index 20b0898c7ead909fc4b26764ea3d15263b04724c..87e659868e26992409c30bb55bbfc9a7f7d23543 100644 |
--- a/chromeos/dbus/dbus_client_bundle.cc |
+++ b/chromeos/dbus/dbus_client_bundle.cc |
@@ -13,18 +13,6 @@ |
#include "chromeos/dbus/amplifier_client.h" |
#include "chromeos/dbus/ap_manager_client.h" |
#include "chromeos/dbus/audio_dsp_client.h" |
-#include "chromeos/dbus/bluetooth_adapter_client.h" |
-#include "chromeos/dbus/bluetooth_agent_manager_client.h" |
-#include "chromeos/dbus/bluetooth_device_client.h" |
-#include "chromeos/dbus/bluetooth_gatt_characteristic_client.h" |
-#include "chromeos/dbus/bluetooth_gatt_descriptor_client.h" |
-#include "chromeos/dbus/bluetooth_gatt_manager_client.h" |
-#include "chromeos/dbus/bluetooth_gatt_service_client.h" |
-#include "chromeos/dbus/bluetooth_input_client.h" |
-#include "chromeos/dbus/bluetooth_le_advertising_manager_client.h" |
-#include "chromeos/dbus/bluetooth_media_client.h" |
-#include "chromeos/dbus/bluetooth_media_transport_client.h" |
-#include "chromeos/dbus/bluetooth_profile_manager_client.h" |
#include "chromeos/dbus/cras_audio_client.h" |
#include "chromeos/dbus/cros_disks_client.h" |
#include "chromeos/dbus/cryptohome_client.h" |
@@ -33,18 +21,6 @@ |
#include "chromeos/dbus/fake_amplifier_client.h" |
#include "chromeos/dbus/fake_ap_manager_client.h" |
#include "chromeos/dbus/fake_audio_dsp_client.h" |
-#include "chromeos/dbus/fake_bluetooth_adapter_client.h" |
-#include "chromeos/dbus/fake_bluetooth_agent_manager_client.h" |
-#include "chromeos/dbus/fake_bluetooth_device_client.h" |
-#include "chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h" |
-#include "chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h" |
-#include "chromeos/dbus/fake_bluetooth_gatt_manager_client.h" |
-#include "chromeos/dbus/fake_bluetooth_gatt_service_client.h" |
-#include "chromeos/dbus/fake_bluetooth_input_client.h" |
-#include "chromeos/dbus/fake_bluetooth_le_advertising_manager_client.h" |
-#include "chromeos/dbus/fake_bluetooth_media_client.h" |
-#include "chromeos/dbus/fake_bluetooth_media_transport_client.h" |
-#include "chromeos/dbus/fake_bluetooth_profile_manager_client.h" |
#include "chromeos/dbus/fake_cras_audio_client.h" |
#include "chromeos/dbus/fake_cryptohome_client.h" |
#include "chromeos/dbus/fake_debug_daemon_client.h" |
@@ -157,47 +133,6 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask) |
else |
audio_dsp_client_.reset(new FakeAudioDspClient); |
- if (!IsUsingStub(BLUETOOTH)) { |
- bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create()); |
- bluetooth_le_advertising_manager_client_.reset( |
- BluetoothLEAdvertisingManagerClient::Create()); |
- bluetooth_agent_manager_client_.reset( |
- BluetoothAgentManagerClient::Create()); |
- bluetooth_device_client_.reset(BluetoothDeviceClient::Create()); |
- bluetooth_input_client_.reset(BluetoothInputClient::Create()); |
- bluetooth_media_client_.reset(BluetoothMediaClient::Create()); |
- bluetooth_media_transport_client_.reset( |
- BluetoothMediaTransportClient::Create()); |
- bluetooth_profile_manager_client_.reset( |
- BluetoothProfileManagerClient::Create()); |
- bluetooth_gatt_characteristic_client_.reset( |
- BluetoothGattCharacteristicClient::Create()); |
- bluetooth_gatt_descriptor_client_.reset( |
- BluetoothGattDescriptorClient::Create()); |
- bluetooth_gatt_manager_client_.reset( |
- BluetoothGattManagerClient::Create()); |
- bluetooth_gatt_service_client_.reset( |
- BluetoothGattServiceClient::Create()); |
- } else { |
- bluetooth_adapter_client_.reset(new FakeBluetoothAdapterClient); |
- bluetooth_le_advertising_manager_client_.reset( |
- new FakeBluetoothLEAdvertisingManagerClient); |
- bluetooth_agent_manager_client_.reset(new FakeBluetoothAgentManagerClient); |
- bluetooth_device_client_.reset(new FakeBluetoothDeviceClient); |
- bluetooth_input_client_.reset(new FakeBluetoothInputClient); |
- bluetooth_media_client_.reset(new FakeBluetoothMediaClient); |
- bluetooth_media_transport_client_.reset( |
- new FakeBluetoothMediaTransportClient); |
- bluetooth_profile_manager_client_.reset( |
- new FakeBluetoothProfileManagerClient); |
- bluetooth_gatt_characteristic_client_.reset( |
- new FakeBluetoothGattCharacteristicClient); |
- bluetooth_gatt_descriptor_client_.reset( |
- new FakeBluetoothGattDescriptorClient); |
- bluetooth_gatt_manager_client_.reset(new FakeBluetoothGattManagerClient); |
- bluetooth_gatt_service_client_.reset(new FakeBluetoothGattServiceClient); |
- } |
- |
if (!IsUsingStub(CRAS)) |
cras_audio_client_.reset(CrasAudioClient::Create()); |
else |