Index: device/bluetooth/bluetooth_chromeos_unittest.cc |
diff --git a/device/bluetooth/bluetooth_chromeos_unittest.cc b/device/bluetooth/bluetooth_chromeos_unittest.cc |
index 3adaacb529403d516634deadb14076b14da8ad13..44025cca63463b34dc567d3bf86bce1e8836fda5 100644 |
--- a/device/bluetooth/bluetooth_chromeos_unittest.cc |
+++ b/device/bluetooth/bluetooth_chromeos_unittest.cc |
@@ -208,13 +208,14 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate { |
class BluetoothChromeOSTest : public testing::Test { |
public: |
virtual void SetUp() { |
- fake_dbus_thread_manager_ = new FakeDBusThreadManager(); |
- DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_); |
- |
- fake_bluetooth_adapter_client_ = |
- fake_dbus_thread_manager_->fake_bluetooth_adapter_client(); |
- fake_bluetooth_device_client_ = |
- fake_dbus_thread_manager_->fake_bluetooth_device_client(); |
+ FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager; |
+ fake_bluetooth_adapter_client_ = new FakeBluetoothAdapterClient; |
+ fake_dbus_thread_manager_->SetBluetoothAdapterClient( |
+ scoped_ptr<BluetoothAdapterClient>(fake_bluetooth_adapter_client_)); |
+ fake_bluetooth_device_client_ = new FakeBluetoothDeviceClient; |
+ fake_dbus_thread_manager_->SetBluetoothDeviceClient( |
+ scoped_ptr<BluetoothDeviceClient>(fake_bluetooth_device_client_)); |
+ DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); |
callback_count_ = 0; |
error_callback_count_ = 0; |