Add content type extension to capabilities

webrtc/media/engine/webrtcvideoengine2_unittest.cc

Index: webrtc/media/engine/webrtcvideoengine2_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
index 37e227f931dc26644aa04f022e1267c94659f679..1ce08513f2803a6618c740d057e00a243292edf0 100644
--- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc
@@ -273,6 +273,29 @@ TEST_F(WebRtcVideoEngine2Test, CVOSetHeaderExtensionBeforeCapturer) {
   EXPECT_TRUE(capturer.apply_rotation());
 }
 
+
+// TODO(ilnik): Remove this test once field trial is gone.
+TEST_F(WebRtcVideoEngine2Test, SupportsVideoContentTypeHeaderExtension) {
+  // Extension shound not be reported outside of the field trial.
+  RtpCapabilities capabilities = engine_.GetCapabilities();
+  ASSERT_FALSE(capabilities.header_extensions.empty());
+  for (const RtpExtension& extension : capabilities.header_extensions) {
+    ASSERT_FALSE(extension.uri == RtpExtension::kVideoContentTypeUri);

[magjed_webrtc, 2017/04/24 09:12:23]

Use assert_eq instead

[ilnik, 2017/04/24 09:19:31]

Did you mean EXPECT_NE?

+  }
+  webrtc::test::ScopedFieldTrials override_field_trials_(
+        "WebRTC-VideoContentTypeExtension/Enabled/");
+  // Should be reported within field trial.
+  capabilities = engine_.GetCapabilities();
+  ASSERT_FALSE(capabilities.header_extensions.empty());
+  for (const RtpExtension& extension : capabilities.header_extensions) {
+    if (extension.uri == RtpExtension::kVideoContentTypeUri) {
+      EXPECT_EQ(RtpExtension::kVideoContentTypeDefaultId, extension.id);
+      return;
+    }
+  }
+  FAIL() << "Video Content Type extension not in header-extension list.";
+}
+
 TEST_F(WebRtcVideoEngine2Test, CVOSetHeaderExtensionBeforeAddSendStream) {
   // Allocate the capturer first to prevent early destruction before channel's
   // dtor is called.