BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 78 insertions, 21 deletions

diff --git a/chromium/third_party/abseil-cpp/BUILD.gn b/chromium/third_party/abseil-cpp/BUILD.gn
index 47ece004f12..b96d354205f 100644
--- a/chromium/third_party/abseil-cpp/BUILD.gn
+++ b/chromium/third_party/abseil-cpp/BUILD.gn
@@ -9,6 +9,61 @@
 import("//build/toolchain/toolchain.gni")
 import("//testing/test.gni")
 
+config("absl_component_build") {
+  defines = [ "ABSL_CONSUME_DLL" ]
+}
+
+# TODO(mbonadei): WebRTC tests and binaries use absl flags but they are
+# marked testonly because we don't want them to be usable in Chromium.
+# Add an absl_flags component which depends on the main absl component.
+component("absl") {
+  if (is_component_build) {
+    public_configs = [ ":absl_component_build" ]
+
+    if (is_win) {
+      if (target_cpu == "x64") {
+        if (is_debug) {
+          sources = [ "symbols_x64_dbg.def" ]
+        } else {
+          sources = [ "symbols_x64_rel.def" ]
+        }
+      }
+      if (target_cpu == "x86") {
+        if (is_debug) {
+          sources = [ "symbols_x86_dbg.def" ]
+        } else {
+          sources = [ "symbols_x86_rel.def" ]
+        }
+      }
+      if (target_cpu == "arm64") {
+        if (is_debug) {
+          sources = [ "symbols_arm64_dbg.def" ]
+        } else {
+          sources = [ "symbols_arm64_rel.def" ]
+        }
+      }
+    }
+  }
+
+  public_deps = [
+    "//third_party/abseil-cpp/absl/algorithm:container",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:core_headers",
+    "//third_party/abseil-cpp/absl/container:inlined_vector",
+
+    # Disabled because of static initializers:
+    # "//third_party/abseil-cpp/absl/debugging:failure_signal_handler",
+    # "//third_party/abseil-cpp/absl/debugging:symbolize",
+
+    "//third_party/abseil-cpp/absl/hash",
+    "//third_party/abseil-cpp/absl/memory",
+    "//third_party/abseil-cpp/absl/meta:type_traits",
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+    "//third_party/abseil-cpp/absl/types:variant",
+  ]
+}
+
 group("default") {
   deps = [
     "absl/types:any",
@@ -77,25 +132,27 @@ config("absl_test_cflags_cc") {
   }
 }
 
-test("absl_tests") {
-  testonly = true
-  deps = [
-    "absl/algorithm:algorithm_test",
-    "absl/algorithm:container_test",
-    "absl/base:config_test",
-    "absl/container:inlined_vector_test",
-    "absl/memory:memory_test",
-    "absl/meta:type_traits_test",
-    "absl/strings:ascii_test",
-    "absl/strings:match_test",
-    "absl/strings:str_replace_test",
-    "absl/strings:string_view_test",
-
-    # TODO(mbonadei): On iOS, gtest doesn't support death tests. Fix upstream
-    # Abseil to use EXPECT_DEATH_IF_SUPPORTED instead of EXPECT_DEATH.
-    # "absl/types:optional_test",
-    # "absl/types:variant_test",
-
-    "//third_party/googletest:gtest_main",
-  ]
+if (!is_component_build) {
+  test("absl_tests") {
+    testonly = true
+    deps = [
+      "absl/algorithm:algorithm_test",
+      "absl/algorithm:container_test",
+      "absl/base:config_test",
+      "absl/container:inlined_vector_test",
+      "absl/memory:memory_test",
+      "absl/meta:type_traits_test",
+      "absl/strings:ascii_test",
+      "absl/strings:match_test",
+      "absl/strings:str_replace_test",
+      "absl/strings:string_view_test",
+
+      # TODO(mbonadei): On iOS, gtest doesn't support death tests. Fix upstream
+      # Abseil to use EXPECT_DEATH_IF_SUPPORTED instead of EXPECT_DEATH.
+      # "absl/types:optional_test",
+      # "absl/types:variant_test",
+
+      "//third_party/googletest:gtest_main",
+    ]
+  }
 }