media: Clean up MediaCodecBridge and remove subclasses

media/base/android/java/src/org/chromium/media/CodecProfileLevelList.java

Index: media/base/android/java/src/org/chromium/media/CodecProfileLevelList.java
diff --git a/media/base/android/java/src/org/chromium/media/CodecProfileLevelList.java b/media/base/android/java/src/org/chromium/media/CodecProfileLevelList.java
index f99b890b17d9c453ef5a8de71b10ed049b6bedd5..5a942ab07b93ef4069530b46c48ce01c582d8926 100644
--- a/media/base/android/java/src/org/chromium/media/CodecProfileLevelList.java
+++ b/media/base/android/java/src/org/chromium/media/CodecProfileLevelList.java
@@ -18,27 +18,6 @@ import java.util.List;
 class CodecProfileLevelList {
     private static final String TAG = "CodecProfileLevelList";
 
-    // The following values are taken from media/base/video_codecs.h. These need to be kept in sync.
-    private static final int H264PROFILE_BASELINE = 0;
-    private static final int H264PROFILE_MAIN = 1;
-    private static final int H264PROFILE_EXTENDED = 2;
-    private static final int H264PROFILE_HIGH = 3;
-    private static final int H264PROFILE_HIGH10PROFILE = 4;
-    private static final int H264PROFILE_HIGH422PROFILE = 5;
-    private static final int H264PROFILE_HIGH444PREDICTIVEPROFILE = 6;
-    private static final int H264PROFILE_SCALABLEBASELINE = 7;
-    private static final int H264PROFILE_SCALABLEHIGH = 8;
-    private static final int H264PROFILE_STEREOHIGH = 9;
-    private static final int H264PROFILE_MULTIVIEWHIGH = 10;
-    private static final int VP8PROFILE_ANY = 11;
-    private static final int VP9PROFILE_PROFILE0 = 12;
-    private static final int VP9PROFILE_PROFILE1 = 13;
-    private static final int VP9PROFILE_PROFILE2 = 14;
-    private static final int VP9PROFILE_PROFILE3 = 15;
-    private static final int HEVCPROFILE_MAIN = 16;
-    private static final int HEVCPROFILE_MAIN10 = 17;
-    private static final int HEVCPROFILE_MAIN_STILL_PICTURE = 18;
-
     // Constants used to keep track of the codec from a mime string.
     private static final String CODEC_AVC = "AVC";
     private static final String CODEC_VP8 = "VP8";
@@ -116,50 +95,50 @@ class CodecProfileLevelList {
             case CODEC_AVC:
                 switch (profile) {
                     case CodecProfileLevel.AVCProfileBaseline:
-                        return H264PROFILE_BASELINE;
+                        return VideoCodecProfile.H264PROFILE_BASELINE;
                     case CodecProfileLevel.AVCProfileMain:
-                        return H264PROFILE_MAIN;
+                        return VideoCodecProfile.H264PROFILE_MAIN;
                     case CodecProfileLevel.AVCProfileExtended:
-                        return H264PROFILE_EXTENDED;
+                        return VideoCodecProfile.H264PROFILE_EXTENDED;
                     case CodecProfileLevel.AVCProfileHigh:
-                        return H264PROFILE_HIGH;
+                        return VideoCodecProfile.H264PROFILE_HIGH;
                     case CodecProfileLevel.AVCProfileHigh10:
-                        return H264PROFILE_HIGH10PROFILE;
+                        return VideoCodecProfile.H264PROFILE_HIGH10PROFILE;
                     case CodecProfileLevel.AVCProfileHigh422:
-                        return H264PROFILE_HIGH422PROFILE;
+                        return VideoCodecProfile.H264PROFILE_HIGH422PROFILE;
                     case CodecProfileLevel.AVCProfileHigh444:
-                        return H264PROFILE_HIGH444PREDICTIVEPROFILE;
+                        return VideoCodecProfile.H264PROFILE_HIGH444PREDICTIVEPROFILE;
                     default:
                         throw new UnsupportedCodecProfileException();
                 }
             case CODEC_VP8:
                 switch (profile) {
                     case CodecProfileLevel.VP8ProfileMain:
-                        return VP8PROFILE_ANY;
+                        return VideoCodecProfile.VP8PROFILE_ANY;
                     default:
                         throw new UnsupportedCodecProfileException();
                 }
             case CODEC_VP9:
                 switch (profile) {
                     case CodecProfileLevel.VP9Profile0:
-                        return VP9PROFILE_PROFILE0;
+                        return VideoCodecProfile.VP9PROFILE_PROFILE0;
                     case CodecProfileLevel.VP9Profile1:
-                        return VP9PROFILE_PROFILE1;
+                        return VideoCodecProfile.VP9PROFILE_PROFILE1;
                     case CodecProfileLevel.VP9Profile2:
-                        return VP9PROFILE_PROFILE2;
+                        return VideoCodecProfile.VP9PROFILE_PROFILE2;
                     case CodecProfileLevel.VP9Profile3:
-                        return VP9PROFILE_PROFILE3;
+                        return VideoCodecProfile.VP9PROFILE_PROFILE3;
                     default:
                         throw new UnsupportedCodecProfileException();
                 }
             case CODEC_HEVC:
                 switch (profile) {
                     case CodecProfileLevel.HEVCProfileMain:
-                        return HEVCPROFILE_MAIN;
+                        return VideoCodecProfile.HEVCPROFILE_MAIN;
                     case CodecProfileLevel.HEVCProfileMain10:
-                        return HEVCPROFILE_MAIN10;
+                        return VideoCodecProfile.HEVCPROFILE_MAIN10;
                     case CodecProfileLevel.HEVCProfileMain10HDR10:
-                        return HEVCPROFILE_MAIN_STILL_PICTURE;
+                        return VideoCodecProfile.HEVCPROFILE_MAIN_STILL_PICTURE;
                     default:
                         throw new UnsupportedCodecProfileException();
                 }