Update to Chromium version 115.0.5790.0 (#1148114)

- Mac: 13.3 SDK (Xcode 14.3) is now required
This commit is contained in:
Marshall Greenblatt
2023-05-30 11:55:32 +03:00
parent cf8b7db4b4
commit 695ee2a041
83 changed files with 604 additions and 633 deletions

View File

@ -1,16 +1,20 @@
diff --git base/test/BUILD.gn base/test/BUILD.gn
index cc75b7235f438..f5bbc354f7918 100644
index a0df3473186a6..02c859e2eca78 100644
--- base/test/BUILD.gn
+++ base/test/BUILD.gn
@@ -175,7 +175,6 @@ static_library("test_support") {
@@ -177,11 +177,6 @@ static_library("test_support") {
if (!is_chromeos) {
# TODO(rasikan): Add to ios and chromeos when unblocked by the chromiumos
# change to add the shared lib to the chrome-binary-tests directory.
- public_deps += [ ":test_trace_processor" ]
- sources += [
- "test_trace_processor.cc",
- "test_trace_processor.h",
- ]
if (is_ios) {
deps += [
":test_trace_processor+bundle",
@@ -490,7 +489,7 @@ if (enable_base_tracing) {
@@ -496,7 +491,7 @@ if (enable_base_tracing) {
# processor depends on dev_sqlite. The two share the same symbols but have
# different implementations, so we need to hide dev_sqlite in this shared
# library even in non-component builds to prevent duplicate symbols.
@ -19,7 +23,16 @@ index cc75b7235f438..f5bbc354f7918 100644
if (is_ios) {
_target_type = "ios_framework_bundle"
}
@@ -516,32 +515,5 @@ if (enable_base_tracing) {
@@ -505,6 +500,8 @@ if (enable_base_tracing) {
defines = [ "TEST_TRACE_PROCESSOR_IMPL" ]
testonly = true
sources = [
+ "test_trace_processor.cc",
+ "test_trace_processor.h",
"test_trace_processor_export.h",
"test_trace_processor_impl.cc",
"test_trace_processor_impl.h",
@@ -522,33 +519,6 @@ if (enable_base_tracing) {
output_name = "TestTraceProcessor"
bundle_deps_filter = [ "//third_party/icu:icudata" ]
}
@ -51,7 +64,8 @@ index cc75b7235f438..f5bbc354f7918 100644
- public_deps = [ ":test_trace_processor" ]
- }
}
}
} else if (!is_component_build && is_mac) {
# Provide a dummy target in order for clients to not have to special-case
diff --git base/test/test_trace_processor_export.h base/test/test_trace_processor_export.h
index f5191b804bc07..aadb7d66ba4c3 100644
--- base/test/test_trace_processor_export.h
@ -74,10 +88,10 @@ index f5191b804bc07..aadb7d66ba4c3 100644
+
#endif // BASE_TEST_TEST_TRACE_PROCESSOR_EXPORT_H_
diff --git content/shell/BUILD.gn content/shell/BUILD.gn
index e0921c6326700..1d3fbfaa532a1 100644
index 1e96da71a8437..2e1b48a4aa9c9 100644
--- content/shell/BUILD.gn
+++ content/shell/BUILD.gn
@@ -809,7 +809,6 @@ if (is_mac) {
@@ -831,7 +831,6 @@ if (is_mac) {
# Specify a sensible install_name for static builds. The library is
# dlopen()ed so this is not used to resolve the module.
ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$output_name.framework/$output_name" ]
@ -86,10 +100,10 @@ index e0921c6326700..1d3fbfaa532a1 100644
# Both the main :content_shell and :content_shell_helper_app executables
# need to link the framework. Because they are at different directory
diff --git gpu/BUILD.gn gpu/BUILD.gn
index 7bbd7cb6be9c2..df9e0f2a93ad9 100644
index 5496a01184497..84a2fe181089f 100644
--- gpu/BUILD.gn
+++ gpu/BUILD.gn
@@ -730,10 +730,7 @@ test("gpu_unittests") {
@@ -735,10 +735,7 @@ test("gpu_unittests") {
"//url",
]
@ -99,5 +113,5 @@ index 7bbd7cb6be9c2..df9e0f2a93ad9 100644
- if (enable_base_tracing && !is_cronet_build && is_chromeos) {
+ if (enable_base_tracing) {
deps += [ "//base/test:test_trace_processor" ]
}
sources += [
"//base/test/test_trace_processor.cc",