BASELINE: Update Chromium to 65.0.3525.40

Also imports missing submodules

Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 98 insertions, 70 deletions

diff --git a/chromium/media/gpu/BUILD.gn b/chromium/media/gpu/BUILD.gn
index ef3e29b6bce..ecd72bd1479 100644
--- a/chromium/media/gpu/BUILD.gn
+++ b/chromium/media/gpu/BUILD.gn
@@ -16,7 +16,6 @@ buildflag_header("features") {
     "USE_VAAPI=$use_vaapi",
     "USE_V4L2_CODEC=$use_v4l2_codec",
     "USE_LIBV4L2=$use_v4lplugin",
-    "ENABLE_MEDIA_CODEC_VIDEO_DECODER=$enable_media_codec_video_decoder",
     "ENABLE_D3D11_VIDEO_DECODER=$enable_d3d11_video_decoder",
   ]
 }
@@ -163,6 +162,8 @@ component("gpu") {
     "//ui/gfx/geometry",
   ]
   deps = [
+    "//gpu/command_buffer/service:gles2",
+    "//gpu/ipc/service",
     "//ui/base",
     "//ui/display/types",
     "//ui/gl",
@@ -207,12 +208,20 @@ component("gpu") {
       "android/avda_state_provider.h",
       "android/avda_surface_bundle.cc",
       "android/avda_surface_bundle.h",
+      "android/codec_image.cc",
+      "android/codec_image.h",
+      "android/codec_image_group.cc",
+      "android/codec_image_group.h",
+      "android/codec_wrapper.cc",
+      "android/codec_wrapper.h",
       "android/content_video_view_overlay.cc",
       "android/content_video_view_overlay.h",
       "android/content_video_view_overlay_allocator.cc",
       "android/content_video_view_overlay_allocator.h",
       "android/device_info.cc",
       "android/device_info.h",
+      "android/media_codec_video_decoder.cc",
+      "android/media_codec_video_decoder.h",
       "android/promotion_hint_aggregator.h",
       "android/promotion_hint_aggregator_impl.cc",
       "android/promotion_hint_aggregator_impl.h",
@@ -220,8 +229,12 @@ component("gpu") {
       "android/surface_chooser_helper.h",
       "android/surface_texture_gl_owner.cc",
       "android/surface_texture_gl_owner.h",
+      "android/video_frame_factory.h",
+      "android/video_frame_factory_impl.cc",
+      "android/video_frame_factory_impl.h",
     ]
     deps += [
+      # TODO(crbug.com/789435): This can be removed once CdmManager is removed.
       "//media/mojo:features",
       "//services/service_manager/public/cpp:cpp",
     ]
@@ -232,26 +245,10 @@ component("gpu") {
         "android/android_video_encode_accelerator.h",
       ]
     }
-    if (enable_media_codec_video_decoder) {
-      assert(mojo_media_host == "gpu", "MCVD requires the CDM")
-      sources += [
-        "android/codec_image.cc",
-        "android/codec_image.h",
-        "android/codec_image_group.cc",
-        "android/codec_image_group.h",
-        "android/codec_wrapper.cc",
-        "android/codec_wrapper.h",
-        "android/media_codec_video_decoder.cc",
-        "android/media_codec_video_decoder.h",
-        "android/video_frame_factory.h",
-        "android/video_frame_factory_impl.cc",
-        "android/video_frame_factory_impl.h",
-      ]
-    }
 
-    # TODO(xhwang): This is needed for AVDA to access the CDM directly.
-    # Remove this dependency after VDAs are also running as part of the mojo
-    # media service. See http://crbug.com/522298
+    # TODO(crbug.com/789435): This is needed for AVDA to access the CDM
+    # directly.  Remove this dependency after VDAs are also running as part of
+    # the mojo media service. See http://crbug.com/522298
     if (mojo_media_host == "gpu") {
       deps += [ "//media/cdm:cdm_manager" ]
     }
@@ -281,20 +278,20 @@ component("gpu") {
       "//ui/ozone",
     ]
     sources += [
-      "generic_v4l2_device.cc",
-      "generic_v4l2_device.h",
-      "v4l2_device.cc",
-      "v4l2_device.h",
-      "v4l2_image_processor.cc",
-      "v4l2_image_processor.h",
-      "v4l2_jpeg_decode_accelerator.cc",
-      "v4l2_jpeg_decode_accelerator.h",
-      "v4l2_slice_video_decode_accelerator.cc",
-      "v4l2_slice_video_decode_accelerator.h",
-      "v4l2_video_decode_accelerator.cc",
-      "v4l2_video_decode_accelerator.h",
-      "v4l2_video_encode_accelerator.cc",
-      "v4l2_video_encode_accelerator.h",
+      "v4l2/generic_v4l2_device.cc",
+      "v4l2/generic_v4l2_device.h",
+      "v4l2/v4l2_device.cc",
+      "v4l2/v4l2_device.h",
+      "v4l2/v4l2_image_processor.cc",
+      "v4l2/v4l2_image_processor.h",
+      "v4l2/v4l2_jpeg_decode_accelerator.cc",
+      "v4l2/v4l2_jpeg_decode_accelerator.h",
+      "v4l2/v4l2_slice_video_decode_accelerator.cc",
+      "v4l2/v4l2_slice_video_decode_accelerator.h",
+      "v4l2/v4l2_video_decode_accelerator.cc",
+      "v4l2/v4l2_video_decode_accelerator.h",
+      "v4l2/v4l2_video_encode_accelerator.cc",
+      "v4l2/v4l2_video_encode_accelerator.h",
     ]
     libs = [
       "EGL",
@@ -302,34 +299,34 @@ component("gpu") {
     ]
     if (current_cpu == "arm") {
       sources += [
-        "tegra_v4l2_device.cc",
-        "tegra_v4l2_device.h",
+        "v4l2/tegra_v4l2_device.cc",
+        "v4l2/tegra_v4l2_device.h",
       ]
     }
   }
 
   if (use_vaapi) {
     sources += [
-                 "va_surface.cc",
-                 "va_surface.h",
-                 "vaapi/vaapi_picture_factory.cc",
-                 "vaapi/vaapi_picture_factory.h",
+                 "vaapi/va_surface.cc",
+                 "vaapi/va_surface.h",
+                 "vaapi/vaapi_jpeg_decode_accelerator.cc",
+                 "vaapi/vaapi_jpeg_decode_accelerator.h",
+                 "vaapi/vaapi_jpeg_decoder.cc",
+                 "vaapi/vaapi_jpeg_decoder.h",
+                 "vaapi/vaapi_jpeg_encode_accelerator.cc",
+                 "vaapi/vaapi_jpeg_encode_accelerator.h",
+                 "vaapi/vaapi_jpeg_encoder.cc",
+                 "vaapi/vaapi_jpeg_encoder.h",
                  "vaapi/vaapi_picture.cc",
                  "vaapi/vaapi_picture.h",
-                 "vaapi_jpeg_decode_accelerator.cc",
-                 "vaapi_jpeg_decode_accelerator.h",
-                 "vaapi_jpeg_decoder.cc",
-                 "vaapi_jpeg_decoder.h",
-                 "vaapi_jpeg_encode_accelerator.cc",
-                 "vaapi_jpeg_encode_accelerator.h",
-                 "vaapi_jpeg_encoder.cc",
-                 "vaapi_jpeg_encoder.h",
-                 "vaapi_video_decode_accelerator.cc",
-                 "vaapi_video_decode_accelerator.h",
-                 "vaapi_video_encode_accelerator.cc",
-                 "vaapi_video_encode_accelerator.h",
-                 "vaapi_wrapper.cc",
-                 "vaapi_wrapper.h",
+                 "vaapi/vaapi_picture_factory.cc",
+                 "vaapi/vaapi_picture_factory.h",
+                 "vaapi/vaapi_video_decode_accelerator.cc",
+                 "vaapi/vaapi_video_decode_accelerator.h",
+                 "vaapi/vaapi_video_encode_accelerator.cc",
+                 "vaapi/vaapi_video_encode_accelerator.h",
+                 "vaapi/vaapi_wrapper.cc",
+                 "vaapi/vaapi_wrapper.h",
                ] + get_target_outputs(":libva_generate_stubs")
     configs += [ "//third_party/libyuv:libyuv_config" ]
     deps += [
@@ -360,19 +357,16 @@ component("gpu") {
 
   if (is_win) {
     sources += [
-      "d3d11_h264_accelerator.cc",
-      "d3d11_h264_accelerator.h",
-      "d3d11_video_decode_accelerator_win.cc",
-      "d3d11_video_decode_accelerator_win.h",
       "dxva_picture_buffer_win.cc",
       "dxva_picture_buffer_win.h",
       "dxva_video_decode_accelerator_win.cc",
       "dxva_video_decode_accelerator_win.h",
       "media_foundation_video_encode_accelerator_win.cc",
       "media_foundation_video_encode_accelerator_win.h",
+      "windows/init_guid.cc",
     ]
     configs += [
-      # TODO(crbug.com/167187): Fix size_t to int truncations.
+      # TODO(https://crbug.com/167187): Fix size_t to int truncations.
       "//build/config/compiler:no_size_t_to_int_warning",
       "//third_party/khronos:khronos_headers",
     ]
@@ -400,6 +394,10 @@ component("gpu") {
     ]
     if (enable_d3d11_video_decoder) {
       sources += [
+        "windows/d3d11_h264_accelerator.cc",
+        "windows/d3d11_h264_accelerator.h",
+        "windows/d3d11_picture_buffer.cc",
+        "windows/d3d11_picture_buffer.h",
         "windows/d3d11_video_decoder.cc",
         "windows/d3d11_video_decoder.h",
         "windows/d3d11_video_decoder_impl.cc",
@@ -461,7 +459,7 @@ if (is_win || is_android || use_v4l2_codec || use_vaapi) {
     }
 
     if (is_win) {
-      # TODO(crbug.com/167187): Fix size_t to int truncations.
+      # TODO(https://crbug.com/167187): Fix size_t to int truncations.
       configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
       deps += [
         "//third_party/angle:libEGL",
@@ -487,9 +485,13 @@ source_set("android_video_decode_accelerator_unittests") {
       "android/android_video_decode_accelerator_unittest.cc",
       "android/android_video_surface_chooser_impl_unittest.cc",
       "android/avda_codec_allocator_unittest.cc",
+      "android/codec_image_group_unittest.cc",
+      "android/codec_image_unittest.cc",
+      "android/codec_wrapper_unittest.cc",
       "android/content_video_view_overlay_allocator_unittest.cc",
       "android/fake_codec_allocator.cc",
       "android/fake_codec_allocator.h",
+      "android/media_codec_video_decoder_unittest.cc",
       "android/mock_android_video_surface_chooser.cc",
       "android/mock_android_video_surface_chooser.h",
       "android/mock_device_info.cc",
@@ -501,16 +503,8 @@ source_set("android_video_decode_accelerator_unittests") {
       "android/promotion_hint_aggregator_impl_unittest.cc",
       "android/surface_chooser_helper_unittest.cc",
       "android/surface_texture_gl_owner_unittest.cc",
+      "android/video_frame_factory_impl_unittest.cc",
     ]
-    if (enable_media_codec_video_decoder) {
-      sources += [
-        "android/codec_image_group_unittest.cc",
-        "android/codec_image_unittest.cc",
-        "android/codec_wrapper_unittest.cc",
-        "android/media_codec_video_decoder_unittest.cc",
-        "android/video_frame_factory_impl_unittest.cc",
-      ]
-    }
     deps = [
       ":gpu",
       "//base/test:test_support",
@@ -519,6 +513,8 @@ source_set("android_video_decode_accelerator_unittests") {
       "//media:test_support",
       "//testing/gmock",
       "//testing/gtest",
+      "//ui/gl",
+      "//ui/gl/init",
     ]
   }
 }
@@ -551,6 +547,38 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
   }
 }
 
+if (use_vaapi) {
+  test("jpeg_encode_accelerator_unittest") {
+    deps = [
+      "//base",
+      "//base/test:test_support",
+      "//media:test_support",
+      "//media/gpu",
+      "//media/gpu/ipc/service",
+      "//testing/gtest",
+      "//third_party:jpeg",
+      "//third_party/libyuv",
+      "//ui/base",
+      "//ui/gfx",
+      "//ui/gfx:test_support",
+      "//ui/gfx/geometry",
+      "//ui/gl",
+      "//ui/gl:test_support",
+    ]
+    configs += [ "//third_party/libyuv:libyuv_config" ]
+    sources = [
+      "jpeg_encode_accelerator_unittest.cc",
+      "video_accelerator_unittest_helpers.h",
+    ]
+    if (use_x11) {
+      deps += [ "//ui/gfx/x" ]
+    }
+    if (use_ozone) {
+      deps += [ "//ui/ozone" ]
+    }
+  }
+}
+
 if (use_v4l2_codec || use_vaapi) {
   test("jpeg_decode_accelerator_unittest") {
     deps = [
@@ -596,7 +624,7 @@ source_set("unit_tests") {
   ]
 
   if (use_vaapi) {
-    sources += [ "vaapi_video_decode_accelerator_unittest.cc" ]
+    sources += [ "vaapi/vaapi_video_decode_accelerator_unittest.cc" ]
     deps += [
       ":gpu",
       "//base/test:test_support",