content/renderer/media/media_stream_dispatcher_unittest.cc - Issue 323313003: Add flag in device enumeration request to control label clearing and don't clear for pepper.

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/renderer/media/media_stream_dispatcher_unittest.cc

Issue 323313003: Add flag in device enumeration request to control label clearing and don't clear for pepper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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 | « content/renderer/media/media_stream_dispatcher.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | content/renderer/pepper/pepper_media_device_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_dispatcher_unittest.cc

diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc

index 3df5d854dd68c2f2b4e6dbb47fa04e922ced3133..7637e4f968b7f5f60bb0f5d959b2cee423cf479f 100644

--- a/content/renderer/media/media_stream_dispatcher_unittest.cc

+++ b/content/renderer/media/media_stream_dispatcher_unittest.cc

@@ -226,13 +226,15 @@ TEST_F(MediaStreamDispatcherTest, BasicVideoDevice) {

dispatcher->EnumerateDevices(

kRequestId1, handler1.get()->AsWeakPtr(),

kVideoType,

- security_origin);

+ security_origin,

+ false);

int ipc_request_id2 = dispatcher->next_ipc_id_;

EXPECT_NE(ipc_request_id1, ipc_request_id2);

dispatcher->EnumerateDevices(

kRequestId2, handler2.get()->AsWeakPtr(),

kVideoType,

- security_origin);

+ security_origin,

+ false);

EXPECT_EQ(dispatcher->requests_.size(), size_t(2));

StreamDeviceInfoArray video_device_array(1);