| Index: content/renderer/media/video_capture_impl_manager_unittest.cc
|
| diff --git a/content/renderer/media/video_capture_impl_manager_unittest.cc b/content/renderer/media/video_capture_impl_manager_unittest.cc
|
| index 817b228ad33055b38ff9d42d4a7bf606c1aa091a..195285af593bba2f5c2c018247a76e5e14dd2129 100644
|
| --- a/content/renderer/media/video_capture_impl_manager_unittest.cc
|
| +++ b/content/renderer/media/video_capture_impl_manager_unittest.cc
|
| @@ -235,31 +235,6 @@ TEST_F(VideoCaptureImplManagerTest, SuspendAndResumeSessions) {
|
| std::array<base::Closure, kNumClients> stop_callbacks =
|
| StartCaptureForAllClients(false);
|
|
|
| - // Call SuspendDevices(true) to suspend all clients, and expect all to be
|
| - // paused.
|
| - {
|
| - base::RunLoop run_loop;
|
| - base::Closure quit_closure = BindToCurrentLoop(run_loop.QuitClosure());
|
| - EXPECT_CALL(*this, OnPaused(0)).Times(1).RetiresOnSaturation();
|
| - EXPECT_CALL(*this, OnPaused(1)).Times(1).RetiresOnSaturation();
|
| - EXPECT_CALL(*this, OnPaused(2)).WillOnce(RunClosure(quit_closure))
|
| - .RetiresOnSaturation();
|
| - manager_->SuspendDevices(true);
|
| - run_loop.Run();
|
| - }
|
| -
|
| - // Call SuspendDevices(false) and expect all to be resumed.
|
| - {
|
| - base::RunLoop run_loop;
|
| - base::Closure quit_closure = BindToCurrentLoop(run_loop.QuitClosure());
|
| - EXPECT_CALL(*this, OnResumed(0)).Times(1).RetiresOnSaturation();
|
| - EXPECT_CALL(*this, OnResumed(1)).Times(1).RetiresOnSaturation();
|
| - EXPECT_CALL(*this, OnResumed(2)).WillOnce(RunClosure(quit_closure))
|
| - .RetiresOnSaturation();
|
| - manager_->SuspendDevices(false);
|
| - run_loop.Run();
|
| - }
|
| -
|
| // Suspend just the first client and expect just the first client to be
|
| // paused.
|
| {
|
| @@ -271,34 +246,15 @@ TEST_F(VideoCaptureImplManagerTest, SuspendAndResumeSessions) {
|
| run_loop.Run();
|
| }
|
|
|
| - // Now call SuspendDevices(true) again, and expect just the second and third
|
| - // clients to be paused.
|
| + // Resume just the first client, and expect just the first client to be
|
| + // resumed.
|
| {
|
| base::RunLoop run_loop;
|
| base::Closure quit_closure = BindToCurrentLoop(run_loop.QuitClosure());
|
| - EXPECT_CALL(*this, OnPaused(1)).Times(1).RetiresOnSaturation();
|
| - EXPECT_CALL(*this, OnPaused(2)).WillOnce(RunClosure(quit_closure))
|
| + EXPECT_CALL(*this, OnResumed(0))
|
| + .WillOnce(RunClosure(quit_closure))
|
| .RetiresOnSaturation();
|
| - manager_->SuspendDevices(true);
|
| - run_loop.Run();
|
| - }
|
| -
|
| - // Resume just the first client, but it should not resume because all devices
|
| - // are supposed to be suspended.
|
| - {
|
| manager_->Resume(0);
|
| - base::RunLoop().RunUntilIdle();
|
| - }
|
| -
|
| - // Now, call SuspendDevices(false) and expect all to be resumed.
|
| - {
|
| - base::RunLoop run_loop;
|
| - base::Closure quit_closure = BindToCurrentLoop(run_loop.QuitClosure());
|
| - EXPECT_CALL(*this, OnResumed(0)).Times(1).RetiresOnSaturation();
|
| - EXPECT_CALL(*this, OnResumed(1)).Times(1).RetiresOnSaturation();
|
| - EXPECT_CALL(*this, OnResumed(2)).WillOnce(RunClosure(quit_closure))
|
| - .RetiresOnSaturation();
|
| - manager_->SuspendDevices(false);
|
| run_loop.Run();
|
| }
|
|
|
|
|