BASELINE: Update Chromium to 86.0.4240.124

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

1 files changed, 20 insertions, 13 deletions

diff --git a/chromium/gpu/BUILD.gn b/chromium/gpu/BUILD.gn
index ecec5ac2f77..070d36d609d 100644
--- a/chromium/gpu/BUILD.gn
+++ b/chromium/gpu/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
@@ -157,13 +156,17 @@ if (!use_static_angle) {
       libs += [ "android" ]
       deps += [ "//ui/android:ui_java" ]
     }
-    if (is_linux && !is_component_build) {
+    if ((is_linux || is_chromeos) && !is_component_build) {
       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
     }
+
+    if (use_ozone) {
+      deps += [ "//ui/base:features" ]
+    }
   }
 }  # if (!use_static_angle)
 
-jumbo_static_library("test_support") {
+static_library("test_support") {
   testonly = true
   sources = [
     "command_buffer/client/client_test_helper.cc",
@@ -263,7 +266,7 @@ if (!is_android && !is_fuchsia && !is_chromeos) {
     defines = [ "GL_GLEXT_PROTOTYPES" ]
 
     if (is_mac) {
-      libs = [ "IOSurface.framework" ]
+      frameworks = [ "IOSurface.framework" ]
     }
 
     deps = [
@@ -406,7 +409,7 @@ test("gl_tests") {
     deps += [ "//ui/android:ui_java" ]
     sources += [ "command_buffer/service/shared_image_backing_factory_ahardwarebuffer_unittest.cc" ]
   } else if (is_mac) {
-    libs += [ "IOSurface.framework" ]
+    frameworks = [ "IOSurface.framework" ]
     sources += [ "command_buffer/service/shared_image_backing_factory_iosurface_unittest.cc" ]
   } else if (is_win) {
     deps += [
@@ -482,8 +485,6 @@ test("gpu_unittests") {
     "command_buffer/service/gl_context_mock.cc",
     "command_buffer/service/gl_context_mock.h",
     "command_buffer/service/gl_context_virtual_unittest.cc",
-    "command_buffer/service/gl_stream_texture_image_stub.cc",
-    "command_buffer/service/gl_stream_texture_image_stub.h",
     "command_buffer/service/gl_surface_mock.cc",
     "command_buffer/service/gl_surface_mock.h",
     "command_buffer/service/gles2_cmd_decoder_unittest.cc",
@@ -583,7 +584,7 @@ test("gpu_unittests") {
     ]
   }
 
-  if (is_linux || use_ozone) {
+  if (is_linux || is_chromeos || use_ozone) {
     sources += [
       "ipc/common/gpu_memory_buffer_impl_native_pixmap_unittest.cc",
       "ipc/service/gpu_memory_buffer_factory_native_pixmap_unittest.cc",
@@ -603,13 +604,13 @@ test("gpu_unittests") {
     ]
   }
 
-  if (is_linux || is_android || is_chromeos) {
+  if (is_linux || is_chromeos || is_android || is_chromeos) {
     sources += [ "command_buffer/service/gpu_fence_manager_unittest.cc" ]
   }
 
   # TODO(geofflang): Run passthrough command decoder unittests on more platforms
   # once initialization of ANGLE's NULL context is supported
-  if ((is_win || (is_linux && !use_ozone)) && !is_asan) {
+  if ((is_win || ((is_linux || is_chromeos) && !use_ozone)) && !is_asan) {
     sources += [
       "command_buffer/service/gles2_cmd_decoder_passthrough_unittest_buffers.cc",
       "command_buffer/service/gles2_cmd_decoder_passthrough_unittest_commands.cc",
@@ -698,7 +699,10 @@ test("gpu_perftests") {
   ]
 
   if (use_ozone) {
-    deps += [ "//ui/ozone" ]
+    deps += [
+      "//ui/base:features",
+      "//ui/ozone",
+    ]
   }
 
   data_deps = [
@@ -732,7 +736,10 @@ test("command_buffer_perftests") {
   ]
 
   if (use_ozone) {
-    deps += [ "//ui/ozone" ]
+    deps += [
+      "//ui/base:features",
+      "//ui/ozone",
+    ]
   }
 
   data_deps = [
@@ -761,7 +768,7 @@ fuzzer_test("gpu_fuzzer") {
   libfuzzer_options = [ "max_len=16384" ]
 }
 
-if (is_linux) {
+if (is_linux || is_chromeos) {
   fuzzer_test("gpu_angle_fuzzer") {
     sources = [ "command_buffer/tests/fuzzer_main.cc" ]