summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorweisert <weisert@yandex-team.ru>2015-02-15 23:11:27 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-16 07:12:17 +0000
commit9a9ad473ba6f8cbb0efc8ffa1c86b077fa1321d3 (patch)
tree1b419fdfd2a43299dbe9be082a8a99f2861ce76e
parentc96d5d2b62b03bae7a3812b441d1470755f7a376 (diff)
downloadchromium_src-9a9ad473ba6f8cbb0efc8ffa1c86b077fa1321d3.zip
chromium_src-9a9ad473ba6f8cbb0efc8ffa1c86b077fa1321d3.tar.gz
chromium_src-9a9ad473ba6f8cbb0efc8ffa1c86b077fa1321d3.tar.bz2
Update test manifest.
"bluetooth" key was moved to the manifests top level. There is no "udp-listen" operation type in extensions/common/permissions/socket_permission_data.cc R=jyasskin@chromium.org TEST=Run unit_tests. Review URL: https://codereview.chromium.org/917123003 Cr-Commit-Position: refs/heads/master@{#316435}
-rw-r--r--chrome/browser/extensions/permission_message_combinations_unittest.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/extensions/permission_message_combinations_unittest.cc b/chrome/browser/extensions/permission_message_combinations_unittest.cc
index 8fa8993..4499273 100644
--- a/chrome/browser/extensions/permission_message_combinations_unittest.cc
+++ b/chrome/browser/extensions/permission_message_combinations_unittest.cc
@@ -354,8 +354,7 @@ TEST_F(PermissionMessageCombinationsUnittest, USBSerialBluetoothCoalescing) {
" },"
" 'permissions': ["
" { 'usbDevices': [{ 'vendorId': 123, 'productId': 456 }] },"
- " 'serial',"
- " 'bluetooth'"
+ " 'serial'"
" ],"
" 'bluetooth': {}"
"}");
@@ -375,8 +374,7 @@ TEST_F(PermissionMessageCombinationsUnittest, USBSerialBluetoothCoalescing) {
" },"
" 'permissions': ["
" { 'usbDevices': [{ 'vendorId': 123, 'productId': 456 }] },"
- " 'serial',"
- " 'bluetooth'"
+ " 'serial'"
" ],"
" 'bluetooth': {"
" 'uuids': ['1105', '1106'],"
@@ -947,8 +945,6 @@ TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
" 'udp-send-to:www.ping.com:50032',"
" 'udp-send-to:test2.ping.com:50032',"
" 'udp-bind:test.ping.com:50032',"
- " 'udp-listen:other.ping.com:50032',"
- " 'udp-listen:www.google.com:50032',"
" ] }"
" ]"
"}");
@@ -1186,7 +1182,6 @@ TEST_F(PermissionMessageCombinationsUnittest, PermissionMessageCombos) {
" },"
" 'permissions': ["
" 'contextMenus',"
- " 'bluetooth',"
" 'permissions',"
" 'accessibilityFeatures.read',"
" 'accessibilityFeatures.modify',"