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

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_manager_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: 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

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/renderer_host/media/media_stream_requester.h » ('j') | content/browser/speech/speech_recognition_dispatcher_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e01b945b8158374b876cd498a05dfeb678cc747b..cc19af2af4c37e607988e956cb11ac8bd61c6d41 100644

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

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

@@ -99,7 +99,7 @@ class MediaStreamManagerTest : public ::testing::Test {

protected:

std::string MakeMediaAccessRequest(int index) {

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;

MediaStreamManager::MediaRequestResponseCallback callback =

@@ -107,7 +107,7 @@ class MediaStreamManagerTest : public ::testing::Test {

base::Unretained(this), index);

StreamOptions options(true, true);

return media_stream_manager_->MakeMediaAccessRequest(render_process_id,

- render_view_id,

+ render_frame_id,

page_request_id,

options,

security_origin,

@@ -146,7 +146,7 @@ TEST_F(MediaStreamManagerTest, MakeMultipleRequests) {

// Second request.

int render_process_id = 2;

- int render_view_id = 2;

+ int render_frame_id = 2;

int page_request_id = 2;

GURL security_origin;

StreamOptions options(true, true);

@@ -155,7 +155,7 @@ TEST_F(MediaStreamManagerTest, MakeMultipleRequests) {

base::Unretained(this), 1);

std::string label2 = media_stream_manager_->MakeMediaAccessRequest(

render_process_id,

- render_view_id,

+ render_frame_id,

page_request_id,

options,

security_origin,