diff options
author | rkc <rkc@chromium.org> | 2015-11-04 17:55:40 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-05 01:56:30 +0000 |
commit | 06c92c041f3b7b62bcddec714fb886b431865057 (patch) | |
tree | 1745f16086c453e1671e6b02df73626cded2f295 /device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h | |
parent | a9ed17edd6831510d2d50680824740a485ae25d6 (diff) | |
download | chromium_src-06c92c041f3b7b62bcddec714fb886b431865057.zip chromium_src-06c92c041f3b7b62bcddec714fb886b431865057.tar.gz chromium_src-06c92c041f3b7b62bcddec714fb886b431865057.tar.bz2 |
Reland: Refactor DBusThreadManager to split away BT clients.
This is a reland of
This CL doesn't change any of the code except for merge and lint changes.
The original CL was triggering a test crash in Valgrind. On this patch,
I've run Valgrind multiple times locally and also additionally run TSan.
Since I am seeing no failures, after talking to glider@ (who works on
Valgrind), I'm attempting to re-land this CL.
TBR=armansito@chromium.org, glider@chromium.org, isherman@chromium.org, oshima@chromium.org, sky@chromium.org, stevenjb@chromium.org
BUG=None.
Committed: c56b94daaf6513891e7da3094ab5054ffbd6262
Cr-Commit-Position: refs/heads/master@{#357707}
Review URL: https://codereview.chromium.org/1411793010
Cr-Commit-Position: refs/heads/master@{#357976}
Diffstat (limited to 'device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h')
-rw-r--r-- | device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h index a23a1178..361b319 100644 --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h @@ -12,10 +12,10 @@ #include <vector> #include "base/memory/weak_ptr.h" -#include "chromeos/dbus/bluetooth_gatt_descriptor_client.h" #include "dbus/object_path.h" #include "device/bluetooth/bluetooth_gatt_characteristic.h" #include "device/bluetooth/bluetooth_uuid.h" +#include "device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h" namespace device { @@ -34,7 +34,7 @@ class BluetoothRemoteGattServiceChromeOS; // platform. class BluetoothRemoteGattCharacteristicChromeOS : public device::BluetoothGattCharacteristic, - public BluetoothGattDescriptorClient::Observer { + public bluez::BluetoothGattDescriptorClient::Observer { public: // device::BluetoothGattCharacteristic overrides. std::string GetIdentifier() const override; @@ -78,7 +78,7 @@ class BluetoothRemoteGattCharacteristicChromeOS const dbus::ObjectPath& object_path); ~BluetoothRemoteGattCharacteristicChromeOS() override; - // BluetoothGattDescriptorClient::Observer overrides. + // bluez::BluetoothGattDescriptorClient::Observer overrides. void GattDescriptorAdded(const dbus::ObjectPath& object_path) override; void GattDescriptorRemoved(const dbus::ObjectPath& object_path) override; void GattDescriptorPropertyChanged(const dbus::ObjectPath& object_path, |