media: Clean up MediaCodecBridge and remove subclasses

media/base/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 
 if (is_android) {
@@ skipping 85 matching lines @@
       "java/src/org/chromium/media/MediaCodecBridge.java",
       "java/src/org/chromium/media/MediaCodecUtil.java",
       "java/src/org/chromium/media/MediaDrmBridge.java",
       "java/src/org/chromium/media/MediaPlayerBridge.java",
       "java/src/org/chromium/media/MediaPlayerListener.java",
       "java/src/org/chromium/media/MediaServerCrashListener.java",
     ]
     jni_package = "media"
   }
 
+  java_cpp_enum("java_enums") {
+    sources = [
+      "media_codec_bridge.h",
+      "media_codec_direction.h",
+    ]
+  }
+
   android_library("media_java") {
     deps = [
       "//base:base_java",
       "//content/public/android:content_java_resources",
+      "//third_party/android_tools:android_support_annotations_java",
     ]
-
+    srcjar_deps = [
+      ":java_enums",
+      "//media/base:java_enums",
+    ]
     java_files = [
       "java/src/org/chromium/media/AudioManagerAndroid.java",
       "java/src/org/chromium/media/AudioRecordInput.java",
       "java/src/org/chromium/media/CodecProfileLevelList.java",
       "java/src/org/chromium/media/MediaCodecBridge.java",
       "java/src/org/chromium/media/MediaCodecUtil.java",
       "java/src/org/chromium/media/MediaDrmBridge.java",
       "java/src/org/chromium/media/MediaPlayerBridge.java",
       "java/src/org/chromium/media/MediaPlayerListener.java",
       "java/src/org/chromium/media/MediaServerCrashListener.java",
     ]
   }
 }