chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc - Issue 19375002: Move GeolocationSettingsState to ContentSettingsUsagesState

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/geolocation/chrome_geolocation_permission_context_unittest.cc

Issue 19375002: Move GeolocationSettingsState to ContentSettingsUsagesState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review #6 Created 7 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

« chrome/browser/content_settings/content_settings_usages_state_unittest.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/geolocation/geolocation_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc

diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc

index 024dc165d4cb7599ab99633610428f79b827c096..10eae8153096b3804984a8a83c327a8bf484f281 100644

--- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc

+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc

@@ -221,11 +221,11 @@ void GeolocationPermissionContextTests::CheckTabContentsState(

ContentSetting expected_content_setting) {

TabSpecificContentSettings* content_settings =

TabSpecificContentSettings::FromWebContents(web_contents());

- const GeolocationSettingsState::StateMap& state_map =

- content_settings->geolocation_settings_state().state_map();

+ const ContentSettingsUsagesState::StateMap& state_map =

+ content_settings->geolocation_usages_state().state_map();

EXPECT_EQ(1U, state_map.count(requesting_frame.GetOrigin()));

EXPECT_EQ(0U, state_map.count(requesting_frame));

- GeolocationSettingsState::StateMap::const_iterator settings =

+ ContentSettingsUsagesState::StateMap::const_iterator settings =

state_map.find(requesting_frame.GetOrigin());

ASSERT_FALSE(settings == state_map.end())

<< "geolocation state not found " << requesting_frame;