| Index: device/bluetooth/bluetooth_adapter.cc
|
| diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
|
| index 09127f981cb48ec266570c74a803285da6f33141..79a865d1c388cf3872d94f4cfe937f793dbccf9b 100644
|
| --- a/device/bluetooth/bluetooth_adapter.cc
|
| +++ b/device/bluetooth/bluetooth_adapter.cc
|
| @@ -17,6 +17,7 @@
|
| #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
|
| #include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
|
| #include "device/bluetooth/bluetooth_remote_gatt_service.h"
|
| +#include "device/bluetooth/bluetooth_types.h"
|
|
|
| namespace device {
|
|
|
| @@ -352,8 +353,8 @@ BluetoothAdapter::GetMergedDiscoveryFilterHelper(
|
| if (first_merge) {
|
| first_merge = false;
|
| if (curr_filter) {
|
| - result.reset(new BluetoothDiscoveryFilter(
|
| - BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL));
|
| + result.reset(
|
| + new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_DUAL));
|
| result->CopyFrom(*curr_filter);
|
| }
|
| continue;
|
|
|