Reland of Stop using hardcoded payload types for video codecs

webrtc/media/engine/webrtcvideoengine2.h

Index: webrtc/media/engine/webrtcvideoengine2.h
diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
index 28dfb9773a284ada65aa405bc6db3eb6bf0c4ea5..546799ec88b0ba8344613929042e0408b972a5e3 100644
--- a/webrtc/media/engine/webrtcvideoengine2.h
+++ b/webrtc/media/engine/webrtcvideoengine2.h
@@ -61,9 +61,6 @@ class WebRtcVoiceMediaChannel;
 
 struct Device;
 
-// Exposed here for unittests.
-std::vector<VideoCodec> DefaultVideoCodecList();
-
 class UnsignalledSsrcHandler {
  public:
   enum Action {
@@ -301,11 +298,11 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
 
     struct AllocatedEncoder {
       AllocatedEncoder(webrtc::VideoEncoder* encoder,
-                       webrtc::VideoCodecType type,
+                       const cricket::VideoCodec& codec,
                        bool external);
       webrtc::VideoEncoder* encoder;
       webrtc::VideoEncoder* external_encoder;
-      webrtc::VideoCodecType type;
+      cricket::VideoCodec codec;
       bool external;
     };