BASELINE: Update Chromium to 75.0.3770.56

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

1 files changed, 25 insertions, 2 deletions

diff --git a/chromium/media/cast/sender/video_sender_unittest.cc b/chromium/media/cast/sender/video_sender_unittest.cc
index 8eadecf5ad6..47b57154e81 100644
--- a/chromium/media/cast/sender/video_sender_unittest.cc
+++ b/chromium/media/cast/sender/video_sender_unittest.cc
@@ -14,6 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/simple_test_tick_clock.h"
+#include "build/build_config.h"
 #include "media/base/fake_single_thread_task_runner.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_environment.h"
@@ -41,6 +42,16 @@ static const int kHeight = 240;
 using testing::_;
 using testing::AtLeast;
 
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+// ExternalEncoder::IsFormatSupported() returns false because some target cannot
+// decode correctly VP8 bitstream generated by ChromeOS Intel HW video encoder.
+// Because of this, ExternalEncoder is not created and a VEA factory function is
+// not called. It causes ExternalEncoder tests fail because it expects the VEA
+// factory function is called.
+// TODO(crbug.com/955286): Run ExternalEncoder tests again once VP8 HW encoding
+// on ChromeOS Intel platform is enabled.
+#define DISABLED_EXTERNAL_ENCODER_TESTS
+#endif
 
 void SaveOperationalStatus(OperationalStatus* out_status,
                            OperationalStatus in_status) {
@@ -258,7 +269,13 @@ TEST_F(VideoSenderTest, BuiltInEncoder) {
   EXPECT_LE(1, transport_->number_of_rtcp_packets());
 }
 
-TEST_F(VideoSenderTest, ExternalEncoder) {
+#ifdef DISABLED_EXTERNAL_ENCODER_TESTS
+#define MAYBE_ExternalEncoder DISABLED_ExternalEncoder
+#else
+#define MAYBE_ExternalEncoder ExternalEncoder
+#endif
+
+TEST_F(VideoSenderTest, MAYBE_ExternalEncoder) {
   InitEncoder(true, true);
   ASSERT_EQ(STATUS_INITIALIZED, operational_status_);
 
@@ -297,7 +314,13 @@ TEST_F(VideoSenderTest, ExternalEncoder) {
   EXPECT_LT(0, vea_factory_.shm_response_count());
 }
 
-TEST_F(VideoSenderTest, ExternalEncoderInitFails) {
+#ifdef DISABLED_EXTERNAL_ENCODER_TESTS
+#define MAYBE_ExternalEncoderInitFails DISABLED_ExternalEncoderInitFails
+#else
+#define MAYBE_ExternalEncoderInitFails ExternalEncoderInitFails
+#endif
+
+TEST_F(VideoSenderTest, MAYBE_ExternalEncoderInitFails) {
   InitEncoder(true, false);
 
   // The SizeAdaptableExternalVideoEncoder initally reports STATUS_INITIALIZED