Index: content/common/gpu/media/gpu_video_encode_accelerator.cc |
diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc |
index 1f4c395cb17a121747fc45d13009751b41125534..3fe89d3a3a45aa0f5fae2a6bf2886a36fdfdda9d 100644 |
--- a/content/common/gpu/media/gpu_video_encode_accelerator.cc |
+++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc |
@@ -165,12 +165,6 @@ void GpuVideoEncodeAccelerator::OnWillDestroyStub() { |
// static |
std::vector<media::VideoEncodeAccelerator::SupportedProfile> |
GpuVideoEncodeAccelerator::GetSupportedProfiles() { |
-#if defined(OS_CHROMEOS) && defined(USE_X11) && defined(ARCH_CPU_ARMEL) |
- // This is a work-around for M39 because the video device is not ready at |
- // boot. |
- // TODO(wuchengli): remove this after http://crbug.com/418762 is fixed. |
- return V4L2VideoEncodeAccelerator::GetSupportedProfilesStatic(); |
-#endif |
scoped_ptr<media::VideoEncodeAccelerator> encoder = CreateEncoder(); |
if (!encoder) |
return std::vector<media::VideoEncodeAccelerator::SupportedProfile>(); |