media: Clean up MediaCodecBridge and remove subclasses

media/base/android/mock_media_codec_bridge.cc

Index: media/base/android/mock_media_codec_bridge.cc
diff --git a/media/base/android/mock_media_codec_bridge.cc b/media/base/android/mock_media_codec_bridge.cc
index 79c62d644456b653995c5adbc4c4ebca6594106c..df4359236eb0189fd8542dc2e2982904ad488eac 100644
--- a/media/base/android/mock_media_codec_bridge.cc
+++ b/media/base/android/mock_media_codec_bridge.cc
@@ -14,9 +14,9 @@ namespace media {
 
 MockMediaCodecBridge::MockMediaCodecBridge() {
   ON_CALL(*this, DequeueInputBuffer(_, _))
-      .WillByDefault(Return(MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER));
+      .WillByDefault(Return(MEDIA_CODEC_TRY_AGAIN_LATER));
   ON_CALL(*this, DequeueOutputBuffer(_, _, _, _, _, _, _))
-      .WillByDefault(Return(MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER));
+      .WillByDefault(Return(MEDIA_CODEC_TRY_AGAIN_LATER));
 }
 
 MockMediaCodecBridge::~MockMediaCodecBridge() {}