summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests_unit.gypi
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2016-01-12 15:14:38 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-12 23:15:52 +0000
commit85f57dbe412733d226d24d71dd556ad2a9c749d9 (patch)
treea056abfe66dcfc19f81bb83113efc6a2f1c51a70 /chrome/chrome_tests_unit.gypi
parent365c1c8e4e45bb9fe9dc35696f1f030d044af2cc (diff)
downloadchromium_src-85f57dbe412733d226d24d71dd556ad2a9c749d9.zip
chromium_src-85f57dbe412733d226d24d71dd556ad2a9c749d9.tar.gz
chromium_src-85f57dbe412733d226d24d71dd556ad2a9c749d9.tar.bz2
Add USB devices to the website settings popup.
This patch adds infrastructure for displaying chooser-style permissions such as USB devices selected by the user to the website settings popup on all desktop platforms (Views and Cocoa). These permissions are used by the WebUSB API. This infrastructure will be used for per-device WebBluetooth permissions as well. An Android implementation is not included as WebUSB is not yet supported in Clank but will be necessary for WebBluetooth. BUG=424667, 529950 Review URL: https://codereview.chromium.org/1413883009 Cr-Commit-Position: refs/heads/master@{#369028}
Diffstat (limited to 'chrome/chrome_tests_unit.gypi')
-rw-r--r--chrome/chrome_tests_unit.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0af6d7a..f9febe9 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2285,7 +2285,9 @@
'../components/components.gyp:webdata_services_test_support',
'../components/components_strings.gyp:components_strings',
'../content/app/resources/content_resources.gyp:content_resources',
+ '../device/core/core.gyp:device_core_mocks',
'../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+ '../device/usb/usb.gyp:device_usb_mocks',
'../gpu/gpu.gyp:gpu_unittest_utils',
'../media/media.gyp:media_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
@@ -2388,9 +2390,7 @@
'sources': [ '<@(chrome_unit_tests_extensions_sources)' ],
'dependencies': [
'common/extensions/api/api.gyp:chrome_api',
- '../device/core/core.gyp:device_core_mocks',
'../device/hid/hid.gyp:device_hid_mocks',
- '../device/usb/usb.gyp:device_usb_mocks',
'../components/components.gyp:audio_modem_test_support',
'../extensions/extensions_resources.gyp:extensions_resources',
'../extensions/extensions_strings.gyp:extensions_strings',