| Index: content/browser/bluetooth/bluetooth_blacklist.cc
|
| diff --git a/content/browser/bluetooth/bluetooth_blacklist.cc b/content/browser/bluetooth/bluetooth_blacklist.cc
|
| index 088848f420f44eb59d9288c4bfd30027f298ed1a..086861eb3b53d3f45b9f043882e044d2336b314f 100644
|
| --- a/content/browser/bluetooth/bluetooth_blacklist.cc
|
| +++ b/content/browser/bluetooth/bluetooth_blacklist.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/metrics/histogram_macros.h"
|
| #include "base/strings/string_split.h"
|
| #include "content/common/bluetooth/bluetooth_scan_filter.h"
|
| +#include "content/public/browser/content_browser_client.h"
|
|
|
| using device::BluetoothUUID;
|
|
|
| @@ -127,10 +128,12 @@ void BluetoothBlacklist::RemoveExcludedUuids(
|
| void BluetoothBlacklist::ResetToDefaultValuesForTest() {
|
| blacklisted_uuids_.clear();
|
| PopulateWithDefaultValues();
|
| + PopulateWithServerProvidedValues();
|
| }
|
|
|
| BluetoothBlacklist::BluetoothBlacklist() {
|
| PopulateWithDefaultValues();
|
| + PopulateWithServerProvidedValues();
|
| }
|
|
|
| void BluetoothBlacklist::PopulateWithDefaultValues() {
|
| @@ -172,4 +175,8 @@ void BluetoothBlacklist::PopulateWithDefaultValues() {
|
| Value::EXCLUDE_READS);
|
| }
|
|
|
| +void BluetoothBlacklist::PopulateWithServerProvidedValues() {
|
| + Add(GetContentClient()->browser()->GetWebBluetoothBlacklist());
|
| +}
|
| +
|
| } // namespace content
|
|
|