content/browser/renderer_host/media/device_request_message_filter_unittest.cc - Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user.

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/device_request_message_filter_unittest.cc

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed review comments from tommi,joi and bauerb. Created 7 years, 1 month 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

« content/browser/media_devices_monitor.cc ('K') | « content/browser/renderer_host/media/device_request_message_filter.cc ('k') | content/browser/renderer_host/media/media_stream_dispatcher_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/device_request_message_filter_unittest.cc

diff --git a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc

index 13a1cdbd2f6c17db68ce802b440d54bb8128ddc3..16435dcf2aeeb901d4c3a896f2e79e53bfa95b4d 100644

--- a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc

+++ b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc

@@ -25,10 +25,11 @@ class MockMediaStreamManager : public MediaStreamManager {

virtual ~MockMediaStreamManager() {}

- MOCK_METHOD6(EnumerateDevices,

+ MOCK_METHOD7(EnumerateDevices,

std::string(MediaStreamRequester* requester,

int render_process_id,

int render_view_id,

+ ResourceContext* rc,

int page_request_id,

MediaStreamType type,

const GURL& security_origin));

@@ -37,6 +38,7 @@ class MockMediaStreamManager : public MediaStreamManager {

std::string DoEnumerateDevices(MediaStreamRequester* requester,

int render_process_id,

int render_view_id,

+ ResourceContext* rc,

int page_request_id,

MediaStreamType type,

const GURL& security_origin) {

@@ -93,10 +95,10 @@ class DeviceRequestMessageFilterTest : public testing::Test {

AddVideoDevices(number_video_devices);

GURL origin("https://test.com");

EXPECT_CALL(*media_stream_manager_,

- EnumerateDevices(_, _, _, _, MEDIA_DEVICE_AUDIO_CAPTURE, _))

+ EnumerateDevices(_, _, _, _, _, MEDIA_DEVICE_AUDIO_CAPTURE, _))

.Times(1);

EXPECT_CALL(*media_stream_manager_,

- EnumerateDevices(_, _, _, _, MEDIA_DEVICE_VIDEO_CAPTURE, _))

+ EnumerateDevices(_, _, _, _, _, MEDIA_DEVICE_VIDEO_CAPTURE, _))

.Times(1);

// Send message to get devices. Should trigger 2 EnumerateDevice() requests.

const int kRequestId = 123;

@@ -137,7 +139,7 @@ class DeviceRequestMessageFilterTest : public testing::Test {

new TestBrowserThread(BrowserThread::IO, message_loop_.get()));

media_stream_manager_.reset(new MockMediaStreamManager());

- ON_CALL(*media_stream_manager_, EnumerateDevices(_, _, _, _, _, _))

+ ON_CALL(*media_stream_manager_, EnumerateDevices(_, _, _, _, _, _, _))

.WillByDefault(Invoke(media_stream_manager_.get(),

&MockMediaStreamManager::DoEnumerateDevices));