From ff04ae6fa1e2205b096566aabab1fffbf81090e5 Mon Sep 17 00:00:00 2001 From: "beaufort.francois" Date: Wed, 28 Sep 2016 05:58:35 -0700 Subject: [PATCH] Disable chrome.bluetoothLowEnergy on non linux platforms BUG=648212 Review-Url: https://codereview.chromium.org/2353483002 Cr-Commit-Position: refs/heads/master@{#421505} --- chrome/test/BUILD.gn | 5 +++- extensions/common/api/_api_features.json | 29 ------------------------ 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 2dd0e902a3def2..b01586da871d6d 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -1360,7 +1360,6 @@ test("browser_tests") { "../browser/extensions/api/autofill_private/autofill_private_apitest.cc", "../browser/extensions/api/automation/automation_apitest.cc", "../browser/extensions/api/autotest_private/autotest_private_apitest.cc", - "../browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc", "../browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc", "../browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc", "../browser/extensions/api/bookmarks/bookmark_apitest.cc", @@ -2659,6 +2658,10 @@ test("browser_tests") { ] } } + + if (is_chromeos || (is_linux && use_dbus)) { + sources += [ "../browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc" ] + } } } diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json index 9b060a8313a247..e2412b7f78bc25 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json @@ -91,35 +91,6 @@ ] }], "bluetoothLowEnergy": { - "dependencies": ["manifest:bluetooth"], - "contexts": ["blessed_extension"] - }, - "bluetoothLowEnergy.createService": { - "dependencies": ["manifest:bluetooth"], - "contexts": ["blessed_extension"], - "platforms": ["chromeos", "linux"] - }, - "bluetoothLowEnergy.createCharacteristic": { - "dependencies": ["manifest:bluetooth"], - "contexts": ["blessed_extension"], - "platforms": ["chromeos", "linux"] - }, - "bluetoothLowEnergy.createDescriptor": { - "dependencies": ["manifest:bluetooth"], - "contexts": ["blessed_extension"], - "platforms": ["chromeos", "linux"] - }, - "bluetoothLowEnergy.registerService": { - "dependencies": ["manifest:bluetooth"], - "contexts": ["blessed_extension"], - "platforms": ["chromeos", "linux"] - }, - "bluetoothLowEnergy.unregisterService": { - "dependencies": ["manifest:bluetooth"], - "contexts": ["blessed_extension"], - "platforms": ["chromeos", "linux"] - }, - "bluetoothLowEnergy.sendRequestResponse": { "dependencies": ["manifest:bluetooth"], "contexts": ["blessed_extension"], "platforms": ["chromeos", "linux"]