1 files changed, 10 insertions, 10 deletions

diff --git a/chromium/media/gpu/video_encode_accelerator_tests.cc b/chromium/media/gpu/video_encode_accelerator_tests.cc
index 99c1d1db010..1948f123838 100644
--- a/chromium/media/gpu/video_encode_accelerator_tests.cc
+++ b/chromium/media/gpu/video_encode_accelerator_tests.cc
@@ -8,7 +8,6 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/optional.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/media_util.h"
 #include "media/base/test_data_util.h"
@@ -29,6 +28,7 @@
 #include "media/gpu/test/video_test_environment.h"
 #include "media/gpu/test/video_test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace media {
 namespace test {
@@ -128,7 +128,7 @@ class VideoEncoderTest : public ::testing::Test {
       const VideoDecoderConfig& decoder_config,
       const size_t last_frame_index,
       VideoFrameValidator::GetModelFrameCB get_model_frame_cb,
-      base::Optional<size_t> num_vp9_temporal_layers_to_decode) {
+      absl::optional<size_t> num_vp9_temporal_layers_to_decode) {
     std::vector<std::unique_ptr<VideoFrameProcessor>> video_frame_processors;
 
     // Attach a video frame writer to store individual frames to disk if
@@ -255,7 +255,7 @@ class VideoEncoderTest : public ::testing::Test {
     } else {
       bitstream_processors.emplace_back(CreateBitstreamValidator(
           video, decoder_config, config.num_frames_to_encode - 1,
-          get_model_frame_cb, base::nullopt));
+          get_model_frame_cb, absl::nullopt));
       LOG_ASSERT(bitstream_processors.back());
     }
     return bitstream_processors;
@@ -276,19 +276,19 @@ class VideoEncoderTest : public ::testing::Test {
   std::unique_ptr<RawDataHelper> raw_data_helper_;
 };
 
-base::Optional<std::string> SupportsDynamicFramerate() {
+absl::optional<std::string> SupportsDynamicFramerate() {
   return g_env->IsKeplerUsed()
-             ? base::make_optional<std::string>(
+             ? absl::make_optional<std::string>(
                    "The rate controller in the kepler firmware doesn't handle "
                    "frame rate changes correctly.")
-             : base::nullopt;
+             : absl::nullopt;
 }
 
-base::Optional<std::string> SupportsNV12DmaBufInput() {
-  return g_env->IsKeplerUsed() ? base::make_optional<std::string>(
+absl::optional<std::string> SupportsNV12DmaBufInput() {
+  return g_env->IsKeplerUsed() ? absl::make_optional<std::string>(
                                      "Encoding with dmabuf input frames is not "
                                      "supported in kepler.")
-                               : base::nullopt;
+                               : absl::nullopt;
 }
 }  // namespace
 
@@ -722,7 +722,7 @@ int main(int argc, char** argv) {
       media::test::VideoEncoderTestEnvironment::Create(
           video_path, video_metadata_path, enable_bitstream_validator,
           output_folder, codec, num_temporal_layers, output_bitstream,
-          /*output_bitrate=*/base::nullopt, frame_output_config);
+          /*output_bitrate=*/absl::nullopt, frame_output_config);
 
   if (!test_environment)
     return EXIT_FAILURE;