| Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
|
| index 9e060d497b8df527cb5a53b3b69b2b1038547ece..95cf734833a7f843c8aba713e34c000f8459167c 100644
|
| --- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
|
| @@ -263,7 +263,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {
|
| }
|
|
|
| virtual void TearDown() OVERRIDE {
|
| - host_->OnChannelClosing();
|
| + host_->OnSenderClosing();
|
| }
|
|
|
| protected:
|
| @@ -804,7 +804,7 @@ TEST_F(MediaStreamDispatcherHostTest,
|
| EXPECT_EQ(host_->video_devices_.size(), 1u);
|
| }
|
|
|
| -TEST_F(MediaStreamDispatcherHostTest, CancelPendingStreamsOnChannelClosing) {
|
| +TEST_F(MediaStreamDispatcherHostTest, CancelPendingStreamsOnSenderClosing) {
|
| StreamOptions options(false, true);
|
|
|
| base::RunLoop run_loop;
|
| @@ -816,12 +816,12 @@ TEST_F(MediaStreamDispatcherHostTest, CancelPendingStreamsOnChannelClosing) {
|
| run_loop.QuitClosure());
|
| }
|
|
|
| - // Calling OnChannelClosing() to cancel all the pending requests.
|
| - host_->OnChannelClosing();
|
| + // Calling OnSenderClosing() to cancel all the pending requests.
|
| + host_->OnSenderClosing();
|
| run_loop.RunUntilIdle();
|
| }
|
|
|
| -TEST_F(MediaStreamDispatcherHostTest, StopGeneratedStreamsOnChannelClosing) {
|
| +TEST_F(MediaStreamDispatcherHostTest, StopGeneratedStreamsOnSenderClosing) {
|
| StreamOptions options(false, true);
|
|
|
| // Create first group of streams.
|
| @@ -831,8 +831,8 @@ TEST_F(MediaStreamDispatcherHostTest, StopGeneratedStreamsOnChannelClosing) {
|
| GenerateStreamAndWaitForResult(kRenderId, kPageRequestId + i, options);
|
| }
|
|
|
| - // Calling OnChannelClosing() to cancel all the pending/generated streams.
|
| - host_->OnChannelClosing();
|
| + // Calling OnSenderClosing() to cancel all the pending/generated streams.
|
| + host_->OnSenderClosing();
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|
|
|