media: Clean up MediaCodecBridge and remove subclasses

media/base/android/mock_media_codec_bridge.h

Index: media/base/android/mock_media_codec_bridge.h
diff --git a/media/base/android/mock_media_codec_bridge.h b/media/base/android/mock_media_codec_bridge.h
index 520adf00b8e0f5e8682df6ab3610cd4be40c5932..e7219cb24d9773b11c18d275f25cdebeeac63a7c 100644
--- a/media/base/android/mock_media_codec_bridge.h
+++ b/media/base/android/mock_media_codec_bridge.h
@@ -15,8 +15,6 @@ class MockMediaCodecBridge : public MediaCodecBridge {
  public:
   MockMediaCodecBridge();
   ~MockMediaCodecBridge() override;
-
-  MOCK_METHOD0(Start, bool());
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD0(Flush, MediaCodecStatus());
   MOCK_METHOD1(GetOutputSize, MediaCodecStatus(gfx::Size* size));
@@ -56,6 +54,10 @@ class MockMediaCodecBridge : public MediaCodecBridge {
       CopyFromOutputBuffer,
       MediaCodecStatus(int index, size_t offset, void* dst, size_t num));
   MOCK_METHOD0(GetName, std::string());
+  MOCK_METHOD1(SetSurface, bool(jobject surface));
+  MOCK_METHOD2(SetVideoBitrate, void(int bps, int frame_rate));
+  MOCK_METHOD0(RequestKeyFrameSoon, void());
+  MOCK_METHOD0(IsAdaptivePlaybackSupported, bool());
 };
 
 }  // namespace media