chrome/browser/permissions/permission_manager_unittest.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/permissions/permission_manager_unittest.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

« no previous file with comments | « chrome/browser/notifications/message_center_settings_controller.cc ('k') | chrome/browser/plugins/plugin_info_message_filter_unittest.cc » ('j') | chrome/browser/push_messaging/push_messaging_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_manager_unittest.cc

diff --git a/chrome/browser/permissions/permission_manager_unittest.cc b/chrome/browser/permissions/permission_manager_unittest.cc

index 4cbc073c74216443fd42f7bfa427ad5fb25c259c..8aa5ec9b80dea269f97fa8c329f8fe2bcf8b7c10 100644

--- a/chrome/browser/permissions/permission_manager_unittest.cc

+++ b/chrome/browser/permissions/permission_manager_unittest.cc

@@ -216,12 +216,9 @@ TEST_F(PermissionManagerTest, WildCardPatternNotifies) {

base::Bind(&PermissionManagerTest::OnPermissionChange,

base::Unretained(this)));

- GetHostContentSettingsMap()->SetContentSetting(

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTINGS_TYPE_GEOLOCATION,

- std::string(),

- CONTENT_SETTING_ALLOW);

+ GetHostContentSettingsMap()->SetContentSettingCustomScope(

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

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

+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),

+ CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), CONTENT_SETTING_ALLOW);

EXPECT_TRUE(callback_called());

EXPECT_EQ(content::PermissionStatus::GRANTED, callback_result());