From 44fe2b5dd4ec842310f65a672ec4ec5dd3804b48 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Mon, 12 Dec 2022 16:14:33 -0500 Subject: [PATCH] Remove _permission_features.json patch and use our override instead. --- .../feature_compiler_helper.py | 5 ++++- .../extensions/api/_permission_features.json | 14 +++++++++++++ ...common-api-_permission_features.json.patch | 20 ------------------- 3 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 patches/extensions-common-api-_permission_features.json.patch diff --git a/chromium_src/python_modules/tools/json_schema_compiler/feature_compiler_helper.py b/chromium_src/python_modules/tools/json_schema_compiler/feature_compiler_helper.py index ce7da7bbe1d..c67957567bb 100644 --- a/chromium_src/python_modules/tools/json_schema_compiler/feature_compiler_helper.py +++ b/chromium_src/python_modules/tools/json_schema_compiler/feature_compiler_helper.py @@ -6,8 +6,8 @@ # When update this method, feature_compiler.py should be touched to make # feature_compiler.py run. json_feature target doesn't have this in its # dependency. -# below discard list comes from common/extensions/api/_api_features.json. def DiscardBraveOverridesFromDupes(dupes): + # below discard list comes from common/extensions/api/_api_features.json. dupes.discard('topSites') dupes.discard('extension.inIncognitoContext') dupes.discard('bookmarkManagerPrivate') @@ -18,3 +18,6 @@ def DiscardBraveOverridesFromDupes(dupes): dupes.discard('sockets.udp') dupes.discard('sockets.tcpServer') dupes.discard('tabs') + # discard list from common/extensions/api/_permission_features.json. + dupes.discard('hid') + dupes.discard('usbDevices') diff --git a/common/extensions/api/_permission_features.json b/common/extensions/api/_permission_features.json index 3549e110cab..392f7105ac5 100644 --- a/common/extensions/api/_permission_features.json +++ b/common/extensions/api/_permission_features.json @@ -24,5 +24,19 @@ "ipfs": { "channel": "stable", "extension_types": ["extension"] + }, + "hid": { + "channel": "stable", + "extension_types": ["extension"], + "allowlist": [ + "21070F3D60711361C1210B870439BE49B5D995F4" // Ethereum Remote Client extension + ] + }, + "usbDevices": { + "channel": "stable", + "extension_types": ["extension"], + "allowlist": [ + "21070F3D60711361C1210B870439BE49B5D995F4" // Ethereum Remote Client extension + ] } } diff --git a/patches/extensions-common-api-_permission_features.json.patch b/patches/extensions-common-api-_permission_features.json.patch deleted file mode 100644 index 43d4f1a412c..00000000000 --- a/patches/extensions-common-api-_permission_features.json.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/extensions/common/api/_permission_features.json b/extensions/common/api/_permission_features.json -index ac9d414bd3c2515934a7ec6a4711fbaa9e7156e5..40cc7e002a61c0045833a074719c60615ecdd1c0 100644 ---- a/extensions/common/api/_permission_features.json -+++ b/extensions/common/api/_permission_features.json -@@ -314,6 +314,7 @@ - "channel": "stable", - "extension_types": ["extension"], - "allowlist": [ -+ "21070F3D60711361C1210B870439BE49B5D995F4", // Ethereum Remote Client extension - "D7CD4B3956B1F6E970E4AFCBCD4094B1EF4D07B9", // http://crbug.com/710541 - "D4EFCCC0CC612380762758BB96C7997224BD6395", // http://crbug.com/710541 - "4839A26B29CD1BD021B2E126EF6D28C9CB84018B", // http://crbug.com/710541 -@@ -662,6 +663,7 @@ - "channel": "stable", - "extension_types": ["extension"], - "allowlist": [ -+ "21070F3D60711361C1210B870439BE49B5D995F4", // Ethereum Remote Client extension - "D7CD4B3956B1F6E970E4AFCBCD4094B1EF4D07B9", // http://crbug.com/710541 - "D4EFCCC0CC612380762758BB96C7997224BD6395", // http://crbug.com/710541 - "4839A26B29CD1BD021B2E126EF6D28C9CB84018B", // http://crbug.com/710541