content/browser/renderer_host/media/video_capture_host_unittest.cc - Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

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

Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: It's random enough. + REBASE Created 6 years, 5 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/browser/renderer_host/media/mock_media_observer.h ('k') | content/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6088081bf7b21f6805a90e2630be1155cffe5cec..1df72ba0b9c856f103fee3409bbfb0d4ae1d6f05 100644

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

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

@@ -86,23 +86,23 @@ class MockMediaStreamRequester : public MediaStreamRequester {

// MediaStreamRequester implementation.

MOCK_METHOD5(StreamGenerated,

- void(int render_view_id,

+ void(int render_frame_id,

int page_request_id,

const std::string& label,

const StreamDeviceInfoArray& audio_devices,

const StreamDeviceInfoArray& video_devices));

MOCK_METHOD3(StreamGenerationFailed,

- void(int render_view_id,

+ void(int render_frame_id,

int page_request_id,

content::MediaStreamRequestResult result));

- MOCK_METHOD3(DeviceStopped, void(int render_view_id,

+ MOCK_METHOD3(DeviceStopped, void(int render_frame_id,

const std::string& label,

const StreamDeviceInfo& device));

- MOCK_METHOD4(DevicesEnumerated, void(int render_view_id,

+ MOCK_METHOD4(DevicesEnumerated, void(int render_frame_id,

int page_request_id,

const std::string& label,

const StreamDeviceInfoArray& devices));

- MOCK_METHOD4(DeviceOpened, void(int render_view_id,

+ MOCK_METHOD4(DeviceOpened, void(int render_frame_id,

int page_request_id,

const std::string& label,

const StreamDeviceInfo& device_info));

@@ -319,7 +319,7 @@ class VideoCaptureHostTest : public testing::Test {

void OpenSession() {

const int render_process_id = 1;

- const int render_view_id = 1;

+ const int render_frame_id = 1;

const int page_request_id = 1;

const GURL security_origin("http://test.com");

@@ -332,13 +332,13 @@ class VideoCaptureHostTest : public testing::Test {

std::string label = media_stream_manager_->EnumerateDevices(

&stream_requester_,

render_process_id,

- render_view_id,

+ render_frame_id,

browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),

page_request_id,

MEDIA_DEVICE_VIDEO_CAPTURE,

security_origin,

true);

- EXPECT_CALL(stream_requester_, DevicesEnumerated(render_view_id,

+ EXPECT_CALL(stream_requester_, DevicesEnumerated(render_frame_id,

page_request_id,

label,

_))

@@ -359,13 +359,13 @@ class VideoCaptureHostTest : public testing::Test {

media_stream_manager_->OpenDevice(

&stream_requester_,

render_process_id,

- render_view_id,

+ render_frame_id,

browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),

page_request_id,

devices[0].device.id,

MEDIA_DEVICE_VIDEO_CAPTURE,

security_origin);

- EXPECT_CALL(stream_requester_, DeviceOpened(render_view_id,

+ EXPECT_CALL(stream_requester_, DeviceOpened(render_frame_id,

page_request_id,

_))