Default enable content type rtp header extension

webrtc/media/engine/webrtcvideoengine.cc

Index: webrtc/media/engine/webrtcvideoengine.cc
diff --git a/webrtc/media/engine/webrtcvideoengine.cc b/webrtc/media/engine/webrtcvideoengine.cc
index 6813ada0ca4c657e14e03ab470ef5deb0181b5a9..52db773ba0e6cce747c52174109229097961b09f 100644
--- a/webrtc/media/engine/webrtcvideoengine.cc
+++ b/webrtc/media/engine/webrtcvideoengine.cc
@@ -55,13 +55,6 @@ bool IsFlexfecAdvertisedFieldTrialEnabled() {
   return webrtc::field_trial::IsEnabled("WebRTC-FlexFEC-03-Advertised");
 }
 
-// If this field trial is enabled, we will report VideoContentType RTP extension
-// in capabilities (thus, it will end up in the default SDP and extension will
-// be sent for all key-frames).
-bool IsVideoContentTypeExtensionFieldTrialEnabled() {
-  return webrtc::field_trial::IsEnabled("WebRTC-VideoContentTypeExtension");
-}
-
 // An encoder factory that wraps Create requests for simulcastable codec types
 // with a webrtc::SimulcastEncoderAdapter. Non simulcastable codec type
 // requests are just passed through to the contained encoder factory.
@@ -430,11 +423,9 @@ RtpCapabilities WebRtcVideoEngine::GetCapabilities() const {
   capabilities.header_extensions.push_back(
       webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri,
                            webrtc::RtpExtension::kPlayoutDelayDefaultId));
-  if (IsVideoContentTypeExtensionFieldTrialEnabled()) {
-    capabilities.header_extensions.push_back(
-        webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri,
-                             webrtc::RtpExtension::kVideoContentTypeDefaultId));
-  }
+  capabilities.header_extensions.push_back(
+      webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri,
+                           webrtc::RtpExtension::kVideoContentTypeDefaultId));
   // TODO(ilnik): Add kVideoTimingUri/kVideoTimingDefaultId to capabilities.
   // Possibly inside field trial.
   return capabilities;