Update to Chromium version 116.0.5845.0 (#1160321)

This commit is contained in:
Marshall Greenblatt
2023-06-26 13:13:38 +03:00
parent 71c588c16a
commit 650755a092
72 changed files with 525 additions and 547 deletions

View File

@@ -1,20 +1,20 @@
diff --git base/test/BUILD.gn base/test/BUILD.gn
index a0df3473186a6..02c859e2eca78 100644
index 93d9c1e810bfb..5a3fdee5eb0dc 100644
--- base/test/BUILD.gn
+++ base/test/BUILD.gn
@@ -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",
@@ -496,7 +491,7 @@ if (enable_base_tracing) {
if (enable_base_tracing) {
public_deps += [ "//third_party/perfetto:perfetto_test_support" ]
- public_deps += [ ":test_trace_processor" ]
- sources += [
- "test_trace_processor.cc",
- "test_trace_processor.h",
- ]
if (is_ios) {
deps += [
":test_trace_processor+bundle",
@@ -527,7 +522,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.
@@ -23,7 +23,7 @@ index a0df3473186a6..02c859e2eca78 100644
if (is_ios) {
_target_type = "ios_framework_bundle"
}
@@ -505,6 +500,8 @@ if (enable_base_tracing) {
@@ -536,6 +531,8 @@ if (enable_base_tracing) {
defines = [ "TEST_TRACE_PROCESSOR_IMPL" ]
testonly = true
sources = [
@@ -32,7 +32,7 @@ index a0df3473186a6..02c859e2eca78 100644
"test_trace_processor_export.h",
"test_trace_processor_impl.cc",
"test_trace_processor_impl.h",
@@ -522,33 +519,6 @@ if (enable_base_tracing) {
@@ -553,33 +550,6 @@ if (enable_base_tracing) {
output_name = "TestTraceProcessor"
bundle_deps_filter = [ "//third_party/icu:icudata" ]
}
@@ -88,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 1e96da71a8437..2e1b48a4aa9c9 100644
index 5d381713fe246..69da944902eb8 100644
--- content/shell/BUILD.gn
+++ content/shell/BUILD.gn
@@ -831,7 +831,6 @@ if (is_mac) {
@@ -833,7 +833,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" ]
@@ -99,19 +99,3 @@ index 1e96da71a8437..2e1b48a4aa9c9 100644
} else {
# 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 5496a01184497..84a2fe181089f 100644
--- gpu/BUILD.gn
+++ gpu/BUILD.gn
@@ -735,10 +735,7 @@ test("gpu_unittests") {
"//url",
]
- # Cronet disables tracing (crbug.com/1400235).
- # TODO(rasikan): Remove when unblocked by chromiumos change to add shared lib
- # to add the shared lib to the chrome-binary-tests directory.
- 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",