content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc - Issue 586223002: Add new media request result MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

Issue 586223002: Add new media request result MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 6 years, 3 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 | « chrome/browser/media/media_stream_devices_controller.cc ('k') | content/browser/renderer_host/media/media_stream_ui_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9000971c806d94fbc2c7bda26420c2af7aecd011..3418500bdb86bf51266400f2bf3e79cc8f68de99 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

@@ -455,6 +455,9 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithAudioOnly) {

EXPECT_EQ(host_->video_devices_.size(), 0u);

}

+// This test simulates a shutdown scenario: we don't setup a fake UI proxy for

+// MediaStreamManager, so it will create an ordinary one which will not find

+// a RenderFrameHostDelegate. This normally should only be the case at shutdown.

TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithNothing) {

StreamOptions options(false, false);

@@ -462,7 +465,7 @@ TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithNothing) {

kRenderId,

kPageRequestId,

options,

- MEDIA_DEVICE_INVALID_STATE);

+ MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN);

}

TEST_F(MediaStreamDispatcherHostTest, GenerateStreamWithAudioAndVideo) {