chrome/browser/media/media_stream_devices_controller_browsertest.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

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 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed patch conflict Created 5 years, 3 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/media_stream_devices_controller.cc ('k') | chrome/browser/media/media_stream_mic_permission_context_factory.h » ('j') | no next file with comments »
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 b4c217125954abeae7eba88eaf6acd5491bae7a0..32d5d4d9c5ad0a705522d9b903f83ceca85b53d9 100644

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

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

@@ -6,6 +6,7 @@

#include "base/bind.h"

#include "base/prefs/pref_service.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

#include "chrome/browser/media/media_capture_devices_dispatcher.h"

#include "chrome/browser/media/media_stream_capture_indicator.h"

@@ -91,8 +92,8 @@ class MediaStreamDevicesControllerTest : public WebRtcTestBase {

void SetContentSettings(ContentSetting mic_setting,

ContentSetting cam_setting) {

HostContentSettingsMap* content_settings =

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

- ->GetHostContentSettingsMap();

+ HostContentSettingsMapFactory::GetForProfile(

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

ContentSettingsPattern pattern =

ContentSettingsPattern::FromURLNoWildcard(example_url_);

content_settings->SetContentSetting(pattern, pattern,