chrome/browser/push_messaging/push_messaging_browsertest.cc - Issue 1818843002: Rename SetContentSetting() to SetContentSettingCustomScope()

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_browsertest.cc

Issue 1818843002: Rename SetContentSetting() to SetContentSettingCustomScope() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix comment alignment Created 4 years, 9 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/permissions/permission_manager_unittest.cc ('K') | « chrome/browser/plugins/plugin_info_message_filter_unittest.cc ('k') | chrome/browser/ui/exclusive_access/fullscreen_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/push_messaging/push_messaging_browsertest.cc

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

index 4caad5185dea57a514a2cf05c2ba07d81d0f723e..5ce6d168eb47d780c82758a707ed39867a13b6a8 100644

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

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

@@ -1086,15 +1086,16 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,

GURL origin = https_server()->GetURL("/").GetOrigin();

HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile())

- ->SetContentSetting(ContentSettingsPattern::Wildcard(),

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(),

- CONTENT_SETTING_ALLOW);

+ ->SetContentSettingCustomScope(ContentSettingsPattern::Wildcard(),

raymes 2016/03/21 06:07:20 nit: I think we could use SetDefaultContentSetting

lshang 2016/03/22 01:26:53 Done.

+ ContentSettingsPattern::Wildcard(),

+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

+ std::string(), CONTENT_SETTING_ALLOW);

HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile())

- ->SetContentSetting(ContentSettingsPattern::FromString("https://*"),

- ContentSettingsPattern::FromString("https://*"),

- CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, std::string(),

- CONTENT_SETTING_ALLOW);

+ ->SetContentSettingCustomScope(

+ ContentSettingsPattern::FromString("https://*"),

+ CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, std::string(),

+ CONTENT_SETTING_ALLOW);

HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile())

->SetContentSettingDefaultScope(origin, GURL(),

CONTENT_SETTINGS_TYPE_NOTIFICATIONS,