| Index: webrtc/media/engine/webrtcvideoengine_unittest.cc
|
| diff --git a/webrtc/media/engine/webrtcvideoengine_unittest.cc b/webrtc/media/engine/webrtcvideoengine_unittest.cc
|
| index f31ac512b7f728e5638d58595339ba114ff6f17e..3af7ef41629b10e2919e8afdcc6d0f990aa2fba1 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine_unittest.cc
|
| +++ b/webrtc/media/engine/webrtcvideoengine_unittest.cc
|
| @@ -273,29 +273,6 @@ TEST_F(WebRtcVideoEngineTest, CVOSetHeaderExtensionBeforeCapturer) {
|
| EXPECT_TRUE(capturer.apply_rotation());
|
| }
|
|
|
| -
|
| -// TODO(ilnik): Remove this test once field trial is gone.
|
| -TEST_F(WebRtcVideoEngineTest, SupportsVideoContentTypeHeaderExtension) {
|
| - // Extension shound not be reported outside of the field trial.
|
| - RtpCapabilities capabilities = engine_.GetCapabilities();
|
| - EXPECT_FALSE(capabilities.header_extensions.empty());
|
| - for (const RtpExtension& extension : capabilities.header_extensions) {
|
| - EXPECT_NE(extension.uri, RtpExtension::kVideoContentTypeUri);
|
| - }
|
| - webrtc::test::ScopedFieldTrials override_field_trials_(
|
| - "WebRTC-VideoContentTypeExtension/Enabled/");
|
| - // Should be reported within field trial.
|
| - capabilities = engine_.GetCapabilities();
|
| - EXPECT_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(WebRtcVideoEngineTest, CVOSetHeaderExtensionBeforeAddSendStream) {
|
| // Allocate the capturer first to prevent early destruction before channel's
|
| // dtor is called.
|
|
|