Replace WebRtcVideoEncoderFactory::VideoCodec with cricket::VideoCodec

webrtc/api/android/jni/androidmediaencoder_jni.h

Index: webrtc/api/android/jni/androidmediaencoder_jni.h
diff --git a/webrtc/api/android/jni/androidmediaencoder_jni.h b/webrtc/api/android/jni/androidmediaencoder_jni.h
index 460eac319337c2fd7b2203276704eb846465af7c..74442ddfbcd217c3c3b3b274ad02f02eb17f9e67 100644
--- a/webrtc/api/android/jni/androidmediaencoder_jni.h
+++ b/webrtc/api/android/jni/androidmediaencoder_jni.h
@@ -28,16 +28,20 @@ class MediaCodecVideoEncoderFactory
   void SetEGLContext(JNIEnv* jni, jobject egl_context);
 
   // WebRtcVideoEncoderFactory implementation.
-  webrtc::VideoEncoder* CreateVideoEncoder(webrtc::VideoCodecType type)
-      override;
-  const std::vector<VideoCodec>& codecs() const override;
+  webrtc::VideoEncoder* CreateVideoEncoder(
+      const cricket::VideoCodec& codec) override;
+  const std::vector<cricket::VideoCodec>& supported_codecs() const override;
   void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
 
  private:
+  // Disable overloaded virtual function warning. TODO(magjed): Remove once
+  // http://crbug/webrtc/6402 is fixed.
+  using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
+
   jobject egl_context_;
 
   // Empty if platform support is lacking, const after ctor returns.
-  std::vector<VideoCodec> supported_codecs_;
+  std::vector<cricket::VideoCodec> supported_codecs_;
 };
 
 }  // namespace webrtc_jni