BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 2 insertions, 15 deletions

diff --git a/chromium/components/system_media_controls/BUILD.gn b/chromium/components/system_media_controls/BUILD.gn
index a34bd8fc847..ebe31647dc0 100644
--- a/chromium/components/system_media_controls/BUILD.gn
+++ b/chromium/components/system_media_controls/BUILD.gn
@@ -4,15 +4,6 @@
 
 import("linux/buildflags/buildflags.gni")
 
-config("media_player_weak_link") {
-  ldflags = [
-    "-weak_framework",
-    "MediaPlayer",
-  ]
-
-  visibility = [ ":system_media_controls" ]
-}
-
 component("system_media_controls") {
   friend = [ ":unit_tests" ]
 
@@ -61,13 +52,9 @@ component("system_media_controls") {
       "mac/system_media_controls_mac.mm",
     ]
     deps += [ "//build:branding_buildflags" ]
-    libs = [ "Foundation.framework" ]
 
-    # MediaPlayer.framework is only available on macOS 10.12 and higher. In a
-    # release build, component() is a static_library, which does not
-    # transitively carry weak_link information. Ensure that all targets that
-    # directly or indirectly carry the weak_link on the framework.
-    all_dependent_configs = [ ":media_player_weak_link" ]
+    frameworks = [ "Foundation.framework" ]
+    weak_frameworks = [ "MediaPlayer.framework" ]
   } else {
     sources = [ "system_media_controls_stub.cc" ]
   }