Index: device/bluetooth/bluetooth_remote_gatt_service_win.cc |
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_win.cc b/device/bluetooth/bluetooth_remote_gatt_service_win.cc |
index dd0e71fc12ac935dd681123aa29ce470ab4604bd..5394abe425460fa88bccb897a13265179e058dc4 100644 |
--- a/device/bluetooth/bluetooth_remote_gatt_service_win.cc |
+++ b/device/bluetooth/bluetooth_remote_gatt_service_win.cc |
@@ -66,10 +66,6 @@ BluetoothUUID BluetoothRemoteGattServiceWin::GetUUID() const { |
return const_cast<BluetoothUUID&>(service_uuid_); |
} |
-bool BluetoothRemoteGattServiceWin::IsLocal() const { |
- return false; |
-} |
- |
bool BluetoothRemoteGattServiceWin::IsPrimary() const { |
return is_primary_; |
} |
@@ -78,22 +74,23 @@ BluetoothDevice* BluetoothRemoteGattServiceWin::GetDevice() const { |
return device_; |
} |
-std::vector<BluetoothGattCharacteristic*> |
+std::vector<BluetoothRemoteGattCharacteristic*> |
BluetoothRemoteGattServiceWin::GetCharacteristics() const { |
- std::vector<BluetoothGattCharacteristic*> has_characteristics; |
+ std::vector<BluetoothRemoteGattCharacteristic*> has_characteristics; |
for (const auto& c : included_characteristics_) |
has_characteristics.push_back(c.second.get()); |
return has_characteristics; |
} |
-std::vector<BluetoothGattService*> |
+std::vector<BluetoothRemoteGattService*> |
BluetoothRemoteGattServiceWin::GetIncludedServices() const { |
NOTIMPLEMENTED(); |
// TODO(crbug.com/590008): Needs implementation. |
- return std::vector<BluetoothGattService*>(); |
+ return std::vector<BluetoothRemoteGattService*>(); |
} |
-BluetoothGattCharacteristic* BluetoothRemoteGattServiceWin::GetCharacteristic( |
+BluetoothRemoteGattCharacteristic* |
+BluetoothRemoteGattServiceWin::GetCharacteristic( |
const std::string& identifier) const { |
GattCharacteristicsMap::const_iterator it = |
included_characteristics_.find(identifier); |
@@ -102,32 +99,6 @@ BluetoothGattCharacteristic* BluetoothRemoteGattServiceWin::GetCharacteristic( |
return nullptr; |
} |
-bool BluetoothRemoteGattServiceWin::AddCharacteristic( |
- device::BluetoothGattCharacteristic* characteristic) { |
- NOTIMPLEMENTED(); |
- return false; |
-} |
- |
-bool BluetoothRemoteGattServiceWin::AddIncludedService( |
- device::BluetoothGattService* service) { |
- NOTIMPLEMENTED(); |
- return false; |
-} |
- |
-void BluetoothRemoteGattServiceWin::Register( |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) { |
- NOTIMPLEMENTED(); |
- error_callback.Run(GATT_ERROR_NOT_SUPPORTED); |
-} |
- |
-void BluetoothRemoteGattServiceWin::Unregister( |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) { |
- NOTIMPLEMENTED(); |
- error_callback.Run(GATT_ERROR_NOT_SUPPORTED); |
-} |
- |
void BluetoothRemoteGattServiceWin::GattCharacteristicDiscoveryComplete( |
BluetoothRemoteGattCharacteristicWin* characteristic) { |
DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); |