git apply for 113.0.5672.93

This commit is contained in:
Carmelo Messina
2023-05-10 10:14:14 +02:00
parent 486766afc9
commit 1dd1741d2e
2 changed files with 6 additions and 18 deletions
+5 -17
View File
@@ -88,7 +88,7 @@ Subject: Diff from 113.0.5672.62
.../extensions/api/eyeo_filtering_private.idl | 191 ++
.../permissions/chrome_api_permissions.cc | 8 +
.../permissions/permission_set_unittest.cc | 8 +
chrome/test/BUILD.gn | 30 +
chrome/test/BUILD.gn | 25 +
chrome/test/base/chrome_test_launcher.cc | 7 +-
chrome/test/base/in_process_browser_test.cc | 17 +-
.../filterlist_that_allows_resource.txt | 7 +
@@ -589,7 +589,7 @@ Subject: Diff from 113.0.5672.62
tools/perf/page_sets/eyeo_page_set.py | 980 +++++++
.../definitions/adblock_private.d.ts | 191 ++
.../definitions/eyeo_filtering_private.d.ts | 228 ++
586 files changed, 56527 insertions(+), 23 deletions(-)
586 files changed, 56522 insertions(+), 23 deletions(-)
create mode 100644 chrome/browser/adblock/README.md
create mode 100644 chrome/browser/adblock/adblock_content_browser_client.cc
create mode 100644 chrome/browser/adblock/adblock_content_browser_client.h
@@ -12058,19 +12058,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/extensions/api/favicon/favicon_apitest.cc",
"../browser/extensions/api/feedback_private/feedback_browsertest.cc",
"../browser/extensions/api/file_system/file_system_apitest.cc",
@@ -3251,6 +3272,11 @@ if (!is_android) {
"//chrome/browser/extensions/api:native_messaging_test_echo_host",
]
}
+ ### Desktop UI patch start
+ sources += [
+ "../browser/extensions/api/adblock_private/adblock_private_apitest.cc",
+ ]
+ ### Desktop UI patch end
if (is_chromeos_ash && enable_extensions) {
deps +=
@@ -5423,6 +5449,7 @@ test("unit_tests") {
@@ -5417,6 +5438,7 @@ test("unit_tests") {
# All unittests in browser, common, renderer and service.
"../browser/about_flags_unittest.cc",
"../browser/active_use_util_unittest.cc",
@@ -12078,7 +12066,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/after_startup_task_utils_unittest.cc",
"../browser/apps/icon_standardizer_unittest.cc",
"../browser/apps/user_type_filter_unittest.cc",
@@ -6025,6 +6052,8 @@ test("unit_tests") {
@@ -6019,6 +6041,8 @@ test("unit_tests") {
"//chrome/services/file_util:unit_tests",
"//chrome/services/qrcode_generator/public/cpp",
"//components/account_id",
@@ -12087,7 +12075,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/assist_ranker/proto",
"//components/autofill/content/browser:test_support",
"//components/background_sync",
@@ -9318,6 +9347,7 @@ if (!is_android) {
@@ -9312,6 +9336,7 @@ if (!is_android) {
public_deps = [
"//chrome/browser:test_support_ui",
@@ -703,7 +703,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5982,7 +5982,6 @@ test("unit_tests") {
@@ -5976,7 +5976,6 @@ test("unit_tests") {
"//chrome/browser/favicon",
"//chrome/browser/feature_guide/notifications:unit_tests",
"//chrome/browser/first_party_sets",