media: Clean up MediaCodecBridge and remove subclasses

media/gpu/android_video_encode_accelerator.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_GPU_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
 #define MEDIA_GPU_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 60 matching lines @@
   void MaybeStartIOTimer();
   void MaybeStopIOTimer();
 
   // Used to DCHECK that we are called on the correct thread.
   base::ThreadChecker thread_checker_;
 
   // VideoDecodeAccelerator::Client callbacks go here.  Invalidated once any
   // error triggers.
   std::unique_ptr<base::WeakPtrFactory<Client>> client_ptr_factory_;
 
-  std::unique_ptr<VideoCodecBridge> media_codec_;
+  std::unique_ptr<MediaCodecBridge> media_codec_;
 
   // Bitstream buffers waiting to be populated & returned to the client.
   std::vector<BitstreamBuffer> available_bitstream_buffers_;
 
   // Frames waiting to be passed to the codec, queued until an input buffer is
   // available.  Each element is a tuple of <Frame, key_frame, enqueue_time>.
   typedef std::queue<std::tuple<scoped_refptr<VideoFrame>, bool, base::Time>>
       PendingFrames;
   PendingFrames pending_frames_;
 
@@ skipping 14 matching lines @@
 
   // True if there is encoder error.
   bool error_occurred_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidVideoEncodeAccelerator);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_