Revert of Refactor MediaCodecBridge to add support for NDK APIs

content/common/gpu/media/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 CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
 #include <queue>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "base/tuple.h"
 #include "content/common/content_export.h"
-#include "media/base/android/sdk_media_codec_bridge.h"
+#include "media/base/android/media_codec_bridge.h"
 #include "media/video/video_encode_accelerator.h"
 
 namespace media {
 class BitstreamBuffer;
 }  // namespace media
 
 namespace content {
 
 // Android-specific implementation of media::VideoEncodeAccelerator, enabling
 // hardware-acceleration of video encoding, based on Android's MediaCodec class
@@ skipping 76 matching lines @@
   size_t output_buffers_capacity_;  // 0 until RequireBitstreamBuffers.
 
   uint32_t last_set_bitrate_;  // In bps.
 
   DISALLOW_COPY_AND_ASSIGN(AndroidVideoEncodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_