Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: content/renderer/media/webrtc/media_stream_video_webrtc_sink_unittest.cc

Issue 2964003002: Remove support for old getUserMedia video constraints algorithm. (Closed)
Patch Set: rebase and address hbos@ comments Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/media_stream_video_webrtc_sink_unittest.cc
diff --git a/content/renderer/media/webrtc/media_stream_video_webrtc_sink_unittest.cc b/content/renderer/media/webrtc/media_stream_video_webrtc_sink_unittest.cc
index ed6ea4ef98895d63c0587be75056c8c54dd016ba..5fff8785d1a010282c27e0b215eea0c1c1126107 100644
--- a/content/renderer/media/webrtc/media_stream_video_webrtc_sink_unittest.cc
+++ b/content/renderer/media/webrtc/media_stream_video_webrtc_sink_unittest.cc
@@ -4,10 +4,8 @@
#include "content/renderer/media/webrtc/media_stream_video_webrtc_sink.h"
-#include "base/test/scoped_feature_list.h"
#include "base/test/scoped_task_environment.h"
#include "content/child/child_process.h"
-#include "content/public/common/content_features.h"
#include "content/renderer/media/mock_constraint_factory.h"
#include "content/renderer/media/mock_media_stream_registry.h"
#include "content/renderer/media/video_track_adapter.h"
@@ -21,10 +19,7 @@ class MediaStreamVideoWebRtcSinkTest : public ::testing::Test {
public:
MediaStreamVideoWebRtcSinkTest()
: scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
- scoped_feature_list_.InitAndDisableFeature(
- features::kMediaStreamOldVideoConstraints);
- }
+ base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
void SetVideoTrack() {
registry_.Init("stream URL");
@@ -36,16 +31,6 @@ class MediaStreamVideoWebRtcSinkTest : public ::testing::Test {
// no valid format, using the track will cause a crash.
}
- void SetVideoTrack(blink::WebMediaConstraints constraints) {
- registry_.Init("stream URL");
- registry_.AddVideoTrack("test video track", constraints);
- blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
- registry_.test_stream().VideoTracks(video_tracks);
- track_ = video_tracks[0];
- // TODO(hta): Verify that track_ is valid. When constraints produce
- // no valid format, using the track will cause a crash.
- }
-
void SetVideoTrack(const base::Optional<bool>& noise_reduction) {
registry_.Init("stream URL");
registry_.AddVideoTrack("test video track", VideoTrackAdapterSettings(),
@@ -67,7 +52,6 @@ class MediaStreamVideoWebRtcSinkTest : public ::testing::Test {
// and Sources in |registry_| into believing they are on the right threads.
base::test::ScopedTaskEnvironment scoped_task_environment_;
const ChildProcess child_process_;
- base::test::ScopedFeatureList scoped_feature_list_;
};
TEST_F(MediaStreamVideoWebRtcSinkTest, NoiseReductionDefaultsToNotSet) {
@@ -85,79 +69,5 @@ TEST_F(MediaStreamVideoWebRtcSinkTest, NoiseReductionConstraintPassThrough) {
EXPECT_TRUE(*(my_sink.SourceNeedsDenoisingForTesting()));
}
-// TODO(guidou): Remove this test. http://crbug.com/706408
-class MediaStreamVideoWebRtcSinkOldConstraintsTest : public ::testing::Test {
- public:
- MediaStreamVideoWebRtcSinkOldConstraintsTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
- scoped_feature_list_.InitAndEnableFeature(
- features::kMediaStreamOldVideoConstraints);
- }
-
- void SetVideoTrack() {
- registry_.Init("stream URL");
- registry_.AddVideoTrack("test video track");
- blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
- registry_.test_stream().VideoTracks(video_tracks);
- track_ = video_tracks[0];
- // TODO(hta): Verify that track_ is valid. When constraints produce
- // no valid format, using the track will cause a crash.
- }
-
- void SetVideoTrack(blink::WebMediaConstraints constraints) {
- registry_.Init("stream URL");
- registry_.AddVideoTrack("test video track", constraints);
- blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
- registry_.test_stream().VideoTracks(video_tracks);
- track_ = video_tracks[0];
- // TODO(hta): Verify that track_ is valid. When constraints produce
- // no valid format, using the track will cause a crash.
- }
-
- void SetVideoTrack(const base::Optional<bool>& noise_reduction) {
- registry_.Init("stream URL");
- registry_.AddVideoTrack("test video track", VideoTrackAdapterSettings(),
- noise_reduction, false, 0.0);
- blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
- registry_.test_stream().VideoTracks(video_tracks);
- track_ = video_tracks[0];
- // TODO(hta): Verify that track_ is valid. When constraints produce
- // no valid format, using the track will cause a crash.
- }
-
- protected:
- blink::WebMediaStreamTrack track_;
- MockPeerConnectionDependencyFactory dependency_factory_;
-
- private:
- MockMediaStreamRegistry registry_;
- // A ChildProcess and a MessageLoopForUI are both needed to fool the Tracks
- // and Sources in |registry_| into believing they are on the right threads.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
- const ChildProcess child_process_;
- base::test::ScopedFeatureList scoped_feature_list_;
-};
-
-TEST_F(MediaStreamVideoWebRtcSinkOldConstraintsTest,
- NoiseReductionDefaultsToNotSet) {
- blink::WebMediaConstraints constraints;
- constraints.Initialize();
- SetVideoTrack(constraints);
- MediaStreamVideoWebRtcSink my_sink(track_, &dependency_factory_);
- EXPECT_TRUE(my_sink.webrtc_video_track());
- EXPECT_FALSE(my_sink.SourceNeedsDenoisingForTesting());
-}
-
-TEST_F(MediaStreamVideoWebRtcSinkOldConstraintsTest,
- NoiseReductionConstraintPassThrough) {
- MockConstraintFactory factory;
- factory.basic().goog_noise_reduction.SetExact(true);
- SetVideoTrack(factory.CreateWebMediaConstraints());
- MediaStreamVideoWebRtcSink my_sink(track_, &dependency_factory_);
- EXPECT_TRUE(my_sink.SourceNeedsDenoisingForTesting());
- EXPECT_TRUE(*(my_sink.SourceNeedsDenoisingForTesting()));
-}
-
} // namespace
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698