chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc - Issue 7328018: Migrate default geolocation content setting to host content settings map.

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/content_settings/content_setting_bubble_model_unittest.cc

Issue 7328018: Migrate default geolocation content setting to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nits Created 9 years, 5 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/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

index 65e2c0f9146dffa93c6600ec7f04bcdacaafc37d..01b2ebf31eabea78e0bef04b363b00981b5d03bd 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

@@ -190,7 +190,8 @@ TEST_F(ContentSettingBubbleModelTest, Geolocation) {

CheckGeolocationBubble(1, true, false);

// Change the default to allow: no message needed.

- setting_map->SetDefaultContentSetting(CONTENT_SETTING_ALLOW);

+ profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(

+ CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);

CheckGeolocationBubble(1, false, false);

// Second frame denied, but not stored in the content map: requires reload.

@@ -198,7 +199,8 @@ TEST_F(ContentSettingBubbleModelTest, Geolocation) {

CheckGeolocationBubble(2, false, true);

// Change the default to block: offer a clear link for the persisted frame 1.

- setting_map->SetDefaultContentSetting(CONTENT_SETTING_BLOCK);

+ profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(

+ CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_BLOCK);

CheckGeolocationBubble(2, true, false);

}