Add proper lifetime of encoder-specific settings.

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 f34844cebfed8c2eded0ad1a314026f488634df3..28a1835a9a120e84da5586115e6b476483133b1e 100644
--- a/webrtc/media/engine/webrtcvideoengine2.h
+++ b/webrtc/media/engine/webrtcvideoengine2.h
@@ -322,12 +322,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
       int height;
     };
 
-    union VideoEncoderSettings {
-      webrtc::VideoCodecH264 h264;
-      webrtc::VideoCodecVP8 vp8;
-      webrtc::VideoCodecVP9 vp9;
-    };
-
     static std::vector<webrtc::VideoStream> CreateVideoStreams(
         const VideoCodec& codec,
         const VideoOptions& options,
@@ -339,7 +333,8 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
         int max_bitrate_bps,
         size_t num_streams);
 
-    void* ConfigureVideoEncoderSettings(const VideoCodec& codec)
+    rtc::scoped_refptr<webrtc::VideoEncoderConfig::EncoderSpecificSettings>
+    ConfigureVideoEncoderSettings(const VideoCodec& codec)
         EXCLUSIVE_LOCKS_REQUIRED(lock_);
 
     AllocatedEncoder CreateVideoEncoder(const VideoCodec& codec)
@@ -390,7 +385,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
     // one stream per MediaChannel.
     webrtc::RtpParameters rtp_parameters_ GUARDED_BY(lock_);
     bool pending_encoder_reconfiguration_ GUARDED_BY(lock_);
-    VideoEncoderSettings encoder_settings_ GUARDED_BY(lock_);
     AllocatedEncoder allocated_encoder_ GUARDED_BY(lock_);
     Dimensions last_dimensions_ GUARDED_BY(lock_);
     webrtc::VideoRotation last_rotation_ GUARDED_BY(lock_) =