chrome/browser/push_messaging/push_messaging_permission_context_unittest.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/push_messaging/push_messaging_permission_context_unittest.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/push_messaging/push_messaging_permission_context_factory.cc ('k') | chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc

diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc b/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc

index 19bfc1b64a459710123edebd21f726958e152789..51ed900a886a7aee453371e0e9583c6c43312447 100644

--- a/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc

+++ b/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc

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

#include "chrome/browser/push_messaging/push_messaging_permission_context.h"

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

#include "chrome/browser/permissions/permission_request_id.h"

#include "chrome/test/base/testing_profile.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

@@ -53,7 +54,7 @@ class PushMessagingPermissionContextTest : public testing::Test {

ContentSettingsPattern pattern =

ContentSettingsPattern::FromString(kOriginA);

HostContentSettingsMap* host_content_settings_map =

- profile->GetHostContentSettingsMap();

+ HostContentSettingsMapFactory::GetForProfile(profile);

host_content_settings_map->SetContentSetting(pattern, pattern, setting,

std::string(), value);

}