Android: enable H264&VP8 HW accelerator for MediaRecorder

content/renderer/media_recorder/video_track_recorder.cc

Index: content/renderer/media_recorder/video_track_recorder.cc
diff --git a/content/renderer/media_recorder/video_track_recorder.cc b/content/renderer/media_recorder/video_track_recorder.cc
index 6bb0e8c79b8a2b85bb35e1e23ea5a8a4e0a8c2f4..f278b6f9740a926c0f4dfc53c69c7c0e1a817543 100644
--- a/content/renderer/media_recorder/video_track_recorder.cc
+++ b/content/renderer/media_recorder/video_track_recorder.cc
@@ -50,7 +50,7 @@ static const struct {
 } kPreferredCodecIdAndVEAProfiles[] = {
     {CodecId::VP8, media::VP8PROFILE_MIN, media::VP8PROFILE_MAX},
     {CodecId::VP9, media::VP9PROFILE_MIN, media::VP9PROFILE_MAX},
-#if BUILDFLAG(RTC_USE_H264)
+#if BUILDFLAG(RTC_USE_H264) || defined(OS_ANDROID)
     {CodecId::H264, media::H264PROFILE_MIN, media::H264PROFILE_MAX}
 #endif
 };
@@ -93,11 +93,6 @@ CodecEnumerator::CodecEnumerator() {
   return;
 #endif
 
-#if defined(OS_ANDROID)
-  // See https://crbug.com/653864.
-  return;
-#endif
-
   content::RenderThreadImpl* const render_thread_impl =
       content::RenderThreadImpl::current();
   if (!render_thread_impl) {