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

Unified Diff: webrtc/media/base/capturemanager_unittest.cc

Issue 1733673002: Removed unused cricket::VideoCapturer methods (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed thread checker for android. SetCaptureFormat is called on the thread where the capturer is cr… Created 4 years, 10 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
« no previous file with comments | « webrtc/media/base/capturemanager.cc ('k') | webrtc/media/base/videocapturer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/capturemanager_unittest.cc
diff --git a/webrtc/media/base/capturemanager_unittest.cc b/webrtc/media/base/capturemanager_unittest.cc
index 2feaf15f48b5b49a9bbf883bcd450fba44d1a07b..e643d9d9c26a899710e72eb0ce6fa8615ae1a176 100644
--- a/webrtc/media/base/capturemanager_unittest.cc
+++ b/webrtc/media/base/capturemanager_unittest.cc
@@ -160,41 +160,3 @@ TEST_F(CaptureManagerTest, MultipleStartStops) {
EXPECT_FALSE(capture_manager_.StopVideoCapture(&video_capturer_,
format_vga_));
}
-
-TEST_F(CaptureManagerTest, TestForceRestart) {
- EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,
- format_qvga_));
- capture_manager_.AddVideoSink(&video_capturer_, &video_renderer_);
- EXPECT_EQ_WAIT(1, callback_count(), kMsCallbackWait);
- EXPECT_TRUE(video_capturer_.CaptureFrame());
- EXPECT_EQ(1, NumFramesRendered());
- EXPECT_TRUE(WasRenderedResolution(format_qvga_));
- // Now restart with vga.
- EXPECT_TRUE(capture_manager_.RestartVideoCapture(
- &video_capturer_, format_qvga_, format_vga_,
- cricket::CaptureManager::kForceRestart));
- EXPECT_TRUE(video_capturer_.CaptureFrame());
- EXPECT_EQ(2, NumFramesRendered());
- EXPECT_TRUE(WasRenderedResolution(format_vga_));
- EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_,
- format_vga_));
-}
-
-TEST_F(CaptureManagerTest, TestRequestRestart) {
- EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,
- format_vga_));
- capture_manager_.AddVideoSink(&video_capturer_, &video_renderer_);
- EXPECT_EQ_WAIT(1, callback_count(), kMsCallbackWait);
- EXPECT_TRUE(video_capturer_.CaptureFrame());
- EXPECT_EQ(1, NumFramesRendered());
- EXPECT_TRUE(WasRenderedResolution(format_vga_));
- // Now request restart with qvga.
- EXPECT_TRUE(capture_manager_.RestartVideoCapture(
- &video_capturer_, format_vga_, format_qvga_,
- cricket::CaptureManager::kRequestRestart));
- EXPECT_TRUE(video_capturer_.CaptureFrame());
- EXPECT_EQ(2, NumFramesRendered());
- EXPECT_TRUE(WasRenderedResolution(format_vga_));
- EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_,
- format_qvga_));
-}
« no previous file with comments | « webrtc/media/base/capturemanager.cc ('k') | webrtc/media/base/videocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698