chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc - Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType

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: chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)

Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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/webrtc/media_stream_devices_controller.cc ('k') | chrome/browser/media/webrtc/media_stream_infobar_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc b/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

index cc56614ae366a1a7e53d92eb95a40109d57e324b..4e21927b2b0521b59b8e3b1ca684d2361b32c684 100644

--- a/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

+++ b/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

@@ -709,10 +709,10 @@ IN_PROC_BROWSER_TEST_F(MediaStreamDevicesControllerTest,

RequestAndKillSwitchMicCam) {

std::map<std::string, std::string> params;

params[PermissionUtil::GetPermissionString(

- content::PermissionType::AUDIO_CAPTURE)] =

+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)] =

PermissionContextBase::kPermissionsKillSwitchBlockedValue;

params[PermissionUtil::GetPermissionString(

- content::PermissionType::VIDEO_CAPTURE)] =

+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)] =

PermissionContextBase::kPermissionsKillSwitchBlockedValue;

variations::AssociateVariationParams(

PermissionContextBase::kPermissionsKillSwitchFieldStudy,