| Index: media/base/android/java/src/org/chromium/media/MediaCodecUtil.java | 
| diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java b/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java | 
| index 6ea84417b76bfd90890568dcaf7f733b0efa4588..a0ec3f30e5d4d0f74c301d79b61dc4bb529b22db 100644 | 
| --- a/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java | 
| +++ b/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java | 
| @@ -33,10 +33,6 @@ import java.util.NoSuchElementException; | 
| class MediaCodecUtil { | 
| private static final String TAG = "cr_MediaCodecUtil"; | 
|  | 
| -    // Codec direction.  Keep this in sync with media_codec_direction.h. | 
| -    static final int MEDIA_CODEC_DECODER = 0; | 
| -    static final int MEDIA_CODEC_ENCODER = 1; | 
| - | 
| /** | 
| * Class to pass parameters from createDecoder() | 
| */ | 
| @@ -148,7 +144,8 @@ class MediaCodecUtil { | 
| String mime, int direction, boolean requireSoftwareCodec) { | 
| MediaCodecListHelper codecListHelper = new MediaCodecListHelper(); | 
| for (MediaCodecInfo info : codecListHelper) { | 
| -            int codecDirection = info.isEncoder() ? MEDIA_CODEC_ENCODER : MEDIA_CODEC_DECODER; | 
| +            int codecDirection = | 
| +                    info.isEncoder() ? MediaCodecDirection.ENCODER : MediaCodecDirection.DECODER; | 
| if (codecDirection != direction) continue; | 
|  | 
| if (requireSoftwareCodec && !isSoftwareCodec(info.getName())) continue; | 
| @@ -281,8 +278,8 @@ class MediaCodecUtil { | 
| try { | 
| // |isSecure| only applies to video decoders. | 
| if (mime.startsWith("video") && isSecure) { | 
| -                String decoderName = | 
| -                        getDefaultCodecName(mime, MEDIA_CODEC_DECODER, requireSoftwareCodec); | 
| +                String decoderName = getDefaultCodecName( | 
| +                        mime, MediaCodecDirection.DECODER, requireSoftwareCodec); | 
| if (decoderName.equals("")) return null; | 
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { | 
| // To work around an issue that we cannot get the codec info from the secure | 
| @@ -298,8 +295,8 @@ class MediaCodecUtil { | 
| result.mediaCodec = MediaCodec.createByCodecName(decoderName + ".secure"); | 
| } else { | 
| if (requireSoftwareCodec) { | 
| -                    String decoderName = | 
| -                            getDefaultCodecName(mime, MEDIA_CODEC_DECODER, requireSoftwareCodec); | 
| +                    String decoderName = getDefaultCodecName( | 
| +                            mime, MediaCodecDirection.DECODER, requireSoftwareCodec); | 
| result.mediaCodec = MediaCodec.createByCodecName(decoderName); | 
| } else { | 
| result.mediaCodec = MediaCodec.createDecoderByType(mime); | 
|  |