Revert 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 546799ec88b0ba8344613929042e0408b972a5e3..28dfb9773a284ada65aa405bc6db3eb6bf0c4ea5 100644
--- a/webrtc/media/engine/webrtcvideoengine2.h
+++ b/webrtc/media/engine/webrtcvideoengine2.h
@@ -60,6 +60,9 @@
 class WebRtcVoiceMediaChannel;
 
 struct Device;
+
+// Exposed here for unittests.
+std::vector<VideoCodec> DefaultVideoCodecList();
 
 class UnsignalledSsrcHandler {
  public:
@@ -298,11 +301,11 @@
 
     struct AllocatedEncoder {
       AllocatedEncoder(webrtc::VideoEncoder* encoder,
-                       const cricket::VideoCodec& codec,
+                       webrtc::VideoCodecType type,
                        bool external);
       webrtc::VideoEncoder* encoder;
       webrtc::VideoEncoder* external_encoder;
-      cricket::VideoCodec codec;
+      webrtc::VideoCodecType type;
       bool external;
     };