diff options
Diffstat (limited to 'content/common/gpu/media/video_encode_accelerator_unittest.cc')
| -rw-r--r-- | content/common/gpu/media/video_encode_accelerator_unittest.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc index 4c57f4f..cc3779b 100644 --- a/content/common/gpu/media/video_encode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc @@ -22,13 +22,9 @@ #include "media/video/video_encode_accelerator.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(USE_X11) -#include "ui/gfx/x/x11_types.h" -#endif - #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) #include "content/common/gpu/media/v4l2_video_encode_accelerator.h" -#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) +#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) #include "content/common/gpu/media/vaapi_video_encode_accelerator.h" #else #error The VideoEncodeAcceleratorUnittest is not supported on this platform. @@ -720,8 +716,8 @@ void VEAClient::CreateEncoder() { #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kEncoder); encoder_.reset(new V4L2VideoEncodeAccelerator(device.Pass())); -#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) - encoder_.reset(new VaapiVideoEncodeAccelerator(gfx::GetXDisplay())); +#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) + encoder_.reset(new VaapiVideoEncodeAccelerator()); #endif SetState(CS_ENCODER_SET); |