Revert of Refactor MediaCodecBridge to add support for NDK APIs

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 70be514eeb0f4166ee3c3a90f238591b56bce7b4..dbd452dee4fbd3d57427db35aa8d697205b706b9 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1187,12 +1187,12 @@
       ],
       'sources': [
         'base/android/access_unit_queue_unittest.cc',
+        'base/android/media_codec_bridge_unittest.cc',
         'base/android/media_codec_decoder_unittest.cc',
         'base/android/media_codec_player_unittest.cc',
         'base/android/media_drm_bridge_unittest.cc',
         'base/android/media_player_bridge_unittest.cc',
         'base/android/media_source_player_unittest.cc',
-        'base/android/sdk_media_codec_bridge_unittest.cc',
         'base/android/test_data_factory.cc',
         'base/android/test_data_factory.h',
         'base/android/test_statistics.h',
@@ -1813,7 +1813,6 @@
             'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
             'base/android/java/src/org/chromium/media/AudioRecordInput.java',
             'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
-            'base/android/java/src/org/chromium/media/MediaCodecUtil.java',
             'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
@@ -1863,8 +1862,6 @@
             'base/android/media_codec_player.h',
             'base/android/media_codec_video_decoder.cc',
             'base/android/media_codec_video_decoder.h',
-            'base/android/media_codec_util.cc',
-            'base/android/media_codec_util.h',
             'base/android/media_common_android.h',
             'base/android/media_decoder_job.cc',
             'base/android/media_decoder_job.h',
@@ -1891,28 +1888,12 @@
             'base/android/media_task_runner.h',
             'base/android/media_url_interceptor.h',
             'base/android/provision_fetcher.h',
-            'base/android/sdk_media_codec_bridge.cc',
-            'base/android/sdk_media_codec_bridge.h',
             'base/android/video_decoder_job.cc',
             'base/android/video_decoder_job.h',
             'base/android/webaudio_media_codec_bridge.cc',
             'base/android/webaudio_media_codec_bridge.h',
             'base/android/webaudio_media_codec_info.h',
           ],
-          'conditions': [
-            # Only 64 bit builds are using android-21 NDK library, check common.gypi
-            ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', {
-              'sources': [
-                'base/android/ndk_media_codec_bridge.cc',
-                'base/android/ndk_media_codec_bridge.h',
-              ],
-              'link_settings': {
-                'libraries': [
-                  '-lmediandk',
-                ],
-              },
-            }],
-          ],
           'dependencies': [
             '../base/base.gyp:base',
             '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',