| Index: extensions/browser/api/bluetooth/bluetooth_private_api.cc
|
| diff --git a/extensions/browser/api/bluetooth/bluetooth_private_api.cc b/extensions/browser/api/bluetooth/bluetooth_private_api.cc
|
| index aa63f2a7be08fca35807a11b49683fe756c74b34..43fca8ca2ccc2897b7873eee8c415ed8204a1a6a 100644
|
| --- a/extensions/browser/api/bluetooth/bluetooth_private_api.cc
|
| +++ b/extensions/browser/api/bluetooth/bluetooth_private_api.cc
|
| @@ -252,7 +252,7 @@ bool BluetoothPrivateSetPairingResponseFunction::DoWork(
|
|
|
| BluetoothEventRouter* router =
|
| BluetoothAPI::Get(browser_context())->event_router();
|
| - if (!router->GetPairingDelegate(extension_id())) {
|
| + if (!router->GetPairingDelegate(GetExtensionId())) {
|
| SetError(kPairingNotEnabled);
|
| SendResponse(false);
|
| return true;
|
| @@ -407,8 +407,10 @@ bool BluetoothPrivateSetDiscoveryFilterFunction::DoWork(
|
| discovery_filter->SetPathloss(*df_param.pathloss);
|
| }
|
|
|
| - BluetoothAPI::Get(browser_context())->event_router()->SetDiscoveryFilter(
|
| - discovery_filter.Pass(), adapter.get(), extension_id(),
|
| + BluetoothAPI::Get(browser_context())
|
| + ->event_router()
|
| + ->SetDiscoveryFilter(
|
| + discovery_filter.Pass(), adapter.get(), GetExtensionId(),
|
| base::Bind(
|
| &BluetoothPrivateSetDiscoveryFilterFunction::OnSuccessCallback,
|
| this),
|
| @@ -446,14 +448,14 @@ bool BluetoothPrivatePairFunction::DoWork(
|
|
|
| BluetoothEventRouter* router =
|
| BluetoothAPI::Get(browser_context())->event_router();
|
| - if (!router->GetPairingDelegate(extension_id())) {
|
| + if (!router->GetPairingDelegate(GetExtensionId())) {
|
| SetError(kPairingNotEnabled);
|
| SendResponse(false);
|
| return true;
|
| }
|
|
|
| device->Pair(
|
| - router->GetPairingDelegate(extension_id()),
|
| + router->GetPairingDelegate(GetExtensionId()),
|
| base::Bind(&BluetoothPrivatePairFunction::OnSuccessCallback, this),
|
| base::Bind(&BluetoothPrivatePairFunction::OnErrorCallback, this));
|
| return true;
|
|
|