BASELINE: Update Chromium to 98.0.4758.90

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

11 files changed, 4 insertions, 21 deletions

diff --git a/chromium/components/chromeos_camera/BUILD.gn b/chromium/components/chromeos_camera/BUILD.gn
index 22e4df0a0d0..c407a8e9808 100644
--- a/chromium/components/chromeos_camera/BUILD.gn
+++ b/chromium/components/chromeos_camera/BUILD.gn
@@ -179,11 +179,6 @@ if (use_v4l2_codec || use_vaapi) {
       deps += [ "//media/gpu/vaapi:common" ]
     }
 
-    # TODO(crbug.com/1029942): consider removing use_x11 support here. This is
-    # no longer needed.
-    if (use_x11) {
-      deps += [ "//ui/gfx/x" ]
-    }
     if (use_ozone) {
       deps += [ "//ui/ozone" ]
     }
@@ -219,11 +214,6 @@ test("jpeg_decode_accelerator_unittest") {
     deps += [ "//media/gpu/vaapi:common" ]
   }
 
-  # TODO(crbug.com/1029942): consider removing use_x11 support here. This is no
-  # longer needed.
-  if (use_x11) {
-    deps += [ "//ui/gfx/x" ]
-  }
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
diff --git a/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.cc b/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.cc
index 19b47a371ad..4f8c6dce8a1 100644
--- a/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.cc
+++ b/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.cc
@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/unaligned_shared_memory.h"
diff --git a/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.h b/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.h
index 64d27969f8d..25f155f1154 100644
--- a/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.h
+++ b/chromium/components/chromeos_camera/fake_mjpeg_decode_accelerator.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "components/chromeos_camera/mjpeg_decode_accelerator.h"
diff --git a/chromium/components/chromeos_camera/gpu_jpeg_encode_accelerator_factory.cc b/chromium/components/chromeos_camera/gpu_jpeg_encode_accelerator_factory.cc
index 6145a80d739..1286e1becde 100644
--- a/chromium/components/chromeos_camera/gpu_jpeg_encode_accelerator_factory.cc
+++ b/chromium/components/chromeos_camera/gpu_jpeg_encode_accelerator_factory.cc
@@ -5,7 +5,7 @@
 #include "components/chromeos_camera/gpu_jpeg_encode_accelerator_factory.h"
 
 #include "base/bind.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "media/base/media_switches.h"
diff --git a/chromium/components/chromeos_camera/gpu_mjpeg_decode_accelerator_factory.cc b/chromium/components/chromeos_camera/gpu_mjpeg_decode_accelerator_factory.cc
index 6f319e8890d..3772b8ef048 100644
--- a/chromium/components/chromeos_camera/gpu_mjpeg_decode_accelerator_factory.cc
+++ b/chromium/components/chromeos_camera/gpu_mjpeg_decode_accelerator_factory.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "components/chromeos_camera/fake_mjpeg_decode_accelerator.h"
diff --git a/chromium/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc b/chromium/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc
index 5c570b60fe4..e5522782b77 100644
--- a/chromium/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc
+++ b/chromium/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/memory/unsafe_shared_memory_region.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
diff --git a/chromium/components/chromeos_camera/mjpeg_decode_accelerator_unittest.cc b/chromium/components/chromeos_camera/mjpeg_decode_accelerator_unittest.cc
index 46c28f621c5..a65d033109b 100644
--- a/chromium/components/chromeos_camera/mjpeg_decode_accelerator_unittest.cc
+++ b/chromium/components/chromeos_camera/mjpeg_decode_accelerator_unittest.cc
@@ -23,7 +23,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/memory/platform_shared_memory_region.h"
 #include "base/memory/shared_memory_mapping.h"
 #include "base/memory/unsafe_shared_memory_region.h"
diff --git a/chromium/components/chromeos_camera/mojo_jpeg_encode_accelerator_service.h b/chromium/components/chromeos_camera/mojo_jpeg_encode_accelerator_service.h
index c63a230fd0a..b3bd62628a4 100644
--- a/chromium/components/chromeos_camera/mojo_jpeg_encode_accelerator_service.h
+++ b/chromium/components/chromeos_camera/mojo_jpeg_encode_accelerator_service.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "components/chromeos_camera/common/jpeg_encode_accelerator.mojom.h"
diff --git a/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.cc b/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.cc
index d2c959d6cfc..0da0ef097c2 100644
--- a/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.cc
+++ b/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.cc
@@ -8,8 +8,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
+#include "base/task/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 
diff --git a/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.h b/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.h
index 760e8fd2dd7..258df6b8edd 100644
--- a/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.h
+++ b/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "base/macros.h"
 #include "components/chromeos_camera/common/mjpeg_decode_accelerator.mojom.h"
 #include "components/chromeos_camera/mjpeg_decode_accelerator.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service.h b/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service.h
index b1640afb65b..e5d9ef319f4 100644
--- a/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service.h
+++ b/chromium/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service.h
@@ -11,7 +11,6 @@
 #include <memory>
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "components/chromeos_camera/common/mjpeg_decode_accelerator.mojom.h"