diff options
| author | tommycli <tommycli@chromium.org> | 2015-11-04 09:07:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-04 17:08:15 +0000 |
| commit | b391a8d38a119bb6625f1429c262c46960d52580 (patch) | |
| tree | 9910ddf3cfc878a75f998acb215bea9801abbd9b /device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h | |
| parent | 38cb3fcf4e18ce504aa08ad8bb0ccc220e14a8e2 (diff) | |
| download | chromium_src-b391a8d38a119bb6625f1429c262c46960d52580.zip chromium_src-b391a8d38a119bb6625f1429c262c46960d52580.tar.gz chromium_src-b391a8d38a119bb6625f1429c262c46960d52580.tar.bz2 | |
Revert of Reland: Refactor DBusThreadManager to split away BT clients. (patchset #1 id:1 of https://codereview.chromium.org/1411793010/ )
Reason for revert:
Crashes memory bot http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%284%29
Original issue's description:
> Reland: Refactor DBusThreadManager to split away BT clients.
>
> This is a reland of https://codereview.chromium.org/1347193004/
>
> 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: https://crrev.com/3c56b94daaf6513891e7da3094ab5054ffbd6262
> Cr-Commit-Position: refs/heads/master@{#357707}
TBR=armansito@chromium.org,glider@chromium.org,isherman@chromium.org,oshima@chromium.org,sky@chromium.org,stevenjb@chromium.org,rkc@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None.
Review URL: https://codereview.chromium.org/1409383004
Cr-Commit-Position: refs/heads/master@{#357834}
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 361b319..a23a1178 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 bluez::BluetoothGattDescriptorClient::Observer { + public BluetoothGattDescriptorClient::Observer { public: // device::BluetoothGattCharacteristic overrides. std::string GetIdentifier() const override; @@ -78,7 +78,7 @@ class BluetoothRemoteGattCharacteristicChromeOS const dbus::ObjectPath& object_path); ~BluetoothRemoteGattCharacteristicChromeOS() override; - // bluez::BluetoothGattDescriptorClient::Observer overrides. + // 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, |