chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_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/ui/exclusive_access/fullscreen_controller_interactive_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/ui/exclusive_access/fullscreen_controller_browsertest.cc ('k') | chrome/browser/ui/exclusive_access/mouse_lock_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc

diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc

index f2f68d0d0afe4d0ffc107273c0bfec006ae6d3fb..4e599013e294f7d547ce30f1cb2fc1bae09cb0e5 100644

--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc

+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc

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

// found in the LICENSE file.

#include "build/build_config.h"

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

#include "chrome/browser/fullscreen.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

@@ -104,7 +105,7 @@ FullscreenControllerInteractiveTest::TestFullscreenMouseLockContentSettings() {

// Add content setting to ALLOW fullscreen.

HostContentSettingsMap* settings_map =

- browser()->profile()->GetHostContentSettingsMap();

+ HostContentSettingsMapFactory::GetForProfile(browser()->profile());

ContentSettingsPattern pattern =

ContentSettingsPattern::FromURL(url);

settings_map->SetContentSetting(