diff options
Diffstat (limited to 'chromium/media/capture/video/video_capture_device_client_unittest.cc')
-rw-r--r-- | chromium/media/capture/video/video_capture_device_client_unittest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/media/capture/video/video_capture_device_client_unittest.cc b/chromium/media/capture/video/video_capture_device_client_unittest.cc index 5ccd550bee7..e23ddf03e51 100644 --- a/chromium/media/capture/video/video_capture_device_client_unittest.cc +++ b/chromium/media/capture/video/video_capture_device_client_unittest.cc @@ -12,6 +12,7 @@ #include "base/check.h" #include "base/macros.h" #include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "media/base/limits.h" #include "media/capture/video/mock_gpu_memory_buffer_manager.h" #include "media/capture/video/mock_video_frame_receiver.h" @@ -21,9 +22,9 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ASH) #include "media/capture/video/chromeos/video_capture_jpeg_decoder.h" -#endif // defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_ASH) using ::testing::_; using ::testing::AtLeast; @@ -37,11 +38,11 @@ namespace media { namespace { -#if defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ASH) std::unique_ptr<VideoCaptureJpegDecoder> ReturnNullPtrAsJpecDecoder() { return nullptr; } -#endif // defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_ASH) } // namespace @@ -60,7 +61,7 @@ class VideoCaptureDeviceClientTest : public ::testing::Test { receiver_ = controller.get(); gpu_memory_buffer_manager_ = std::make_unique<unittest_internal::MockGpuMemoryBufferManager>(); -#if defined(OS_CHROMEOS) +#if BUILDFLAG(IS_ASH) device_client_ = std::make_unique<VideoCaptureDeviceClient>( VideoCaptureBufferType::kSharedMemory, std::move(controller), buffer_pool, base::BindRepeating(&ReturnNullPtrAsJpecDecoder)); @@ -68,7 +69,7 @@ class VideoCaptureDeviceClientTest : public ::testing::Test { device_client_ = std::make_unique<VideoCaptureDeviceClient>( VideoCaptureBufferType::kSharedMemory, std::move(controller), buffer_pool); -#endif // defined(OS_CHROMEOS) +#endif // BUILDFLAG(IS_ASH) } ~VideoCaptureDeviceClientTest() override = default; |