BASELINE: Update Chromium to 86.0.4240.124

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

2 files changed, 43 insertions, 29 deletions

diff --git a/chromium/cc/mojom/BUILD.gn b/chromium/cc/mojom/BUILD.gn
index 12d79257d5d..7c0b5ab0237 100644
--- a/chromium/cc/mojom/BUILD.gn
+++ b/chromium/cc/mojom/BUILD.gn
@@ -7,40 +7,46 @@ import("//mojo/public/tools/bindings/mojom.gni")
 mojom("mojom") {
   generate_java = true
   sources = [
+    "browser_controls_params.mojom",
     "overscroll_behavior.mojom",
     "touch_action.mojom",
   ]
 
   public_deps = [ "//mojo/public/mojom/base" ]
 
-  touch_action_typemap = {
-    types = [
-      {
-        mojom = "cc.mojom.TouchAction"
-        cpp = "::cc::TouchAction"
-      },
-    ]
-    traits_headers = [ "//cc/ipc/cc_param_traits_macros.h" ]
-    traits_public_deps = [ "//cc/ipc" ]
-  }
-
-  overscroll_behavior_typemap = {
-    types = [
-      {
-        mojom = "cc.mojom.OverscrollBehavior"
-        cpp = "::cc::OverscrollBehavior"
-      },
-    ]
-    traits_headers = [ "//cc/ipc/cc_param_traits_macros.h" ]
-    traits_public_deps = [ "//cc/ipc" ]
-  }
-
-  cpp_typemaps = [
-    overscroll_behavior_typemap,
-    touch_action_typemap,
-  ]
-  blink_cpp_typemaps = [
-    overscroll_behavior_typemap,
-    touch_action_typemap,
+  shared_typemap = [
+    {
+      types = [
+        {
+          mojom = "cc.mojom.TouchAction"
+          cpp = "::cc::TouchAction"
+        },
+      ]
+      traits_headers = [ "//cc/ipc/cc_param_traits_macros.h" ]
+      traits_public_deps = [ "//cc/ipc" ]
+    },
+    {
+      types = [
+        {
+          mojom = "cc.mojom.OverscrollBehavior"
+          cpp = "::cc::OverscrollBehavior"
+        },
+      ]
+      traits_headers = [ "//cc/ipc/cc_param_traits_macros.h" ]
+      traits_public_deps = [ "//cc/ipc" ]
+    },
+    {
+      types = [
+        {
+          mojom = "cc.mojom.BrowserControlsParams"
+          cpp = "::cc::BrowserControlsParams"
+        },
+      ]
+      traits_headers = [ "//cc/ipc/cc_param_traits_macros.h" ]
+      traits_public_deps = [ "//cc/ipc" ]
+    },
   ]
+
+  cpp_typemaps = shared_typemap
+  blink_cpp_typemaps = shared_typemap
 }
diff --git a/chromium/cc/mojom/browser_controls_params.mojom b/chromium/cc/mojom/browser_controls_params.mojom
new file mode 100644
index 00000000000..0fbf83c43c7
--- /dev/null
+++ b/chromium/cc/mojom/browser_controls_params.mojom
@@ -0,0 +1,8 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module cc.mojom;
+
+[Native]
+struct BrowserControlsParams;