chrome/browser/media/media_stream_devices_controller_browsertest.cc - Issue 1686343002: Change HostContentSettingsMap::SetContentSetting to use GURLs instead of patterns

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

Issue 1686343002: Change HostContentSettingsMap::SetContentSetting to use GURLs instead of patterns (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add migrate method Created 4 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

« chrome/browser/content_settings/host_content_settings_map_unittest.cc ('K') | « chrome/browser/media/media_stream_devices_controller.cc ('k') | components/content_settings/core/browser/host_content_settings_map.h » ('j') | components/content_settings/core/browser/host_content_settings_map.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_devices_controller_browsertest.cc

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

index bf7018cdd7a71b35e363906cce128f81e9afefd3..1c341fb283c9cf4b82052230d0cc68b67ee01c68 100644

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

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

@@ -99,13 +99,11 @@ class MediaStreamDevicesControllerTest : public WebRtcTestBase {

HostContentSettingsMap* content_settings =

HostContentSettingsMapFactory::GetForProfile(

Profile::FromBrowserContext(GetWebContents()->GetBrowserContext()));

- ContentSettingsPattern pattern =

- ContentSettingsPattern::FromURLNoWildcard(example_url_);

- content_settings->SetContentSetting(pattern, pattern,

- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,

- std::string(), mic_setting);

- content_settings->SetContentSetting(

- pattern, pattern, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

+ content_settings->SetContentSettingDefaultScope(

+ example_url_, GURL(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,

+ std::string(), mic_setting);

+ content_settings->SetContentSettingDefaultScope(

+ example_url_, GURL(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

std::string(), cam_setting);

}